JC Brand ff4af318b2 Merge branch 'skeleton' of github.com:jcbrand/converse.js into skeleton ... Conflicts: sass/converse.scss		2014-12-13 16:46:15 +01:00
..
converse.scss	Merge branch 'skeleton' of github.com:jcbrand/converse.js into skeleton	2014-12-13 16:46:15 +01:00