JC Brand 5f97f7ea28 Merge branch 'master' into gh-pages ...

Conflicts:
	build.js
	converse.min.css
	converse.min.js
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
	index.html

2013-07-30 23:40:59 +02:00

14 KiB

Raw History

View Raw