JC Brand 05c2c95b5f Merge branch 'master' into gh-pages ... Conflicts: CHANGES.rst converse.min.js		2013-07-25 00:19:13 +02:00
..
environment.pickle	Merge branch 'master' into gh-pages	2013-07-25 00:19:13 +02:00
index.doctree	Update documentation	2013-07-25 00:09:09 +02:00