Merge branches 'typos' and 'formatierung' into update
authorThomas Hochstein <thh@inter.net>
Sun, 8 May 2011 10:07:43 +0000 (12:07 +0200)
committerThomas Hochstein <thh@inter.net>
Sun, 8 May 2011 10:07:43 +0000 (12:07 +0200)
Conflicts:
ChangeLog

1  2 
ChangeLog
dana-manual

diff --cc ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,8 @@@
  dana-manual 2.1.1 (unreleased)
  
    * Korrektur der Liste der Bereitsteller ungefilteter Accounts
 +  * Anpassung einiger Formulierungen, Korrektur von Typos.
+   * Kleine Anpassungen an der Formatierung
  
  
  dana-manual 2.1.0 (2011-05-01)
diff --cc dana-manual
Simple merge
This page took 0.013509 seconds and 4 git commands to generate.