JC Brand f0b01a958e Merge branch 'master' into gh-pages ... Conflicts: docs/doctrees/environment.pickle docs/html/searchindex.js		2013-08-09 09:23:32 +02:00
..
doctrees	Merge branch 'master' into gh-pages	2013-08-09 09:23:32 +02:00
html	Merge branch 'master' into gh-pages	2013-08-09 09:23:32 +02:00
source	Update development section of the docs	2013-08-09 09:21:20 +02:00