JC Brand c62a4ae575 Merge branch 'master' into gh-pages ... Conflicts: docs/doctrees/environment.pickle docs/html/searchindex.js		2013-08-04 18:51:33 +02:00
..
doctrees	Merge branch 'master' into gh-pages	2013-08-04 18:51:33 +02:00
html	Merge branch 'master' into gh-pages	2013-08-04 18:51:33 +02:00
source	Bump version to 0.5.1	2013-08-04 18:48:29 +02:00