From: Thomas Hochstein <thh@inter.net>
Date: Sun, 8 May 2011 10:07:43 +0000 (+0200)
Subject: Merge branches 'typos' and 'formatierung' into update
X-Git-Tag: 2.1.1~4
X-Git-Url: https://code.th-h.de/?p=faqs%2Fdana-manual.git;a=commitdiff_plain;h=0d268641a9307c6d739926b4c59fe1db7d460324;hp=0d268641a9307c6d739926b4c59fe1db7d460324

Merge branches 'typos' and 'formatierung' into update

Conflicts:
	ChangeLog
---