Martin Zimmermann 7886c20aef Merge branch 'master' into dev ... Conflicts: MANIFEST.in docs/docs/install.rst isso/tests/test_html.py		2014-07-14 20:03:50 +02:00
..
isso.conf	Merge branch 'master' into dev	2014-07-14 20:03:50 +02:00