JC Brand ae96dc1e64 Merge branch 'master' into mockup ... Conflicts: docs/html/_static/stylesheet.css docs/html/searchindex.js		2013-08-15 18:01:26 +02:00
..
doctrees	Remove pickle, which causes many merge errors	2013-08-13 11:23:04 +02:00
html	Merge branch 'master' into mockup	2013-08-15 18:01:26 +02:00
source	Add info on facebook integration	2013-08-13 11:19:40 +02:00