Sebastian Spaeth 4b323f7532 Merge branch 'next'
Conflicts:
	Changelog.draft.rst
	docs/MANUAL.rst

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2012-04-02 23:50:58 +02:00
..
2012-04-02 23:50:58 +02:00
2012-01-17 01:34:56 +01:00