JC Brand b6a6562de9 Merge branch '0.6.x' ... Conflicts: Makefile converse.css converse.min.css converse.min.js docs/doctrees/index.doctree docs/html/index.html docs/html/searchindex.js		2013-10-08 22:12:12 +02:00
..
index.doctree	Merge branch '0.6.x'	2013-10-08 22:12:12 +02:00