Martin Zimmermann 721e87a843 Merge branch 'legacy/0.9' ... Conflicts: CHANGES.rst docs/docs/configuration/client.rst setup.py		2014-08-18 13:09:24 +02:00
..
client.rst	add option to hide voting feature, closes #115	2014-08-18 12:32:16 +02:00
server.rst	Merge branch 'legacy/0.9'	2014-08-10 12:09:11 +02:00