JC Brand 57fc8b9832 Merge branch 'master' into otr ... Conflicts: docs/html/_static/stylesheet.css docs/html/searchindex.js		2013-08-16 11:28:34 +02:00
..
doctrees	Remove pickle, which causes many merge errors	2013-08-13 11:23:04 +02:00
html	Merge branch 'master' into otr	2013-08-16 11:28:34 +02:00
source	Mention debug option in docs	2013-08-16 11:25:58 +02:00