JC Brand e2ed7757ff Merge branch 'master' into gh-pages ... Conflicts: CHANGES.rst docs/doctrees/environment.pickle index.html		2013-07-27 01:23:27 +02:00
..
environment.pickle	Merge branch 'master' into gh-pages	2013-07-27 01:23:27 +02:00
index.doctree	Remove no-locales file, it wasn't built properly	2013-07-25 00:22:57 +02:00