JC Brand 1fa47c6633 Merge branch '0.6.x' ... Conflicts: converse.min.js docs/html/searchindex.js		2013-10-16 11:50:55 +02:00
..
doctrees	Merge branch '0.6.x'	2013-10-08 22:12:12 +02:00
html	Merge branch '0.6.x'	2013-10-16 11:50:55 +02:00
source	Merge branch '0.6.x'	2013-10-16 11:50:55 +02:00
RELEASE_CHECKLIST.txt	Regenerated docs (new version number). Add release checklist	2013-09-15 21:37:56 +02:00