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
..
index.doctree	'build' grunt task was renamed to 'fetch'. Updated docs	2013-07-30 21:43:49 +02:00