JC Brand 3746d332a3 Merge branch 'master' into gh-pages ... Conflicts: docs/doctrees/environment.pickle docs/html/searchindex.js index.html		2013-07-27 02:07:33 +02:00
..
environment.pickle	Merge branch 'master' into gh-pages	2013-07-27 02:07:33 +02:00
index.doctree	docs w.r.t using development files with(out) require.js. Updates #9	2013-07-27 01:48:40 +02:00