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

..

nametrans.rst

Revamped documentation structure and some doc fixes

2012-02-24 11:13:27 +01:00