Merge branch 'update'
authorThomas Hochstein <thh@inter.net>
Sat, 3 Dec 2011 23:23:09 +0000 (00:23 +0100)
committerThomas Hochstein <thh@inter.net>
Sat, 3 Dec 2011 23:23:09 +0000 (00:23 +0100)
* update:
  Kleine Formulierungsaenderungen.
  Kleine Aenderungen.
  Neuer Abschnitt: Loeschungen u.a. Aenderungen (7.)

Conflicts:
dana-manual

Signed-off-by: Thomas Hochstein <thh@inter.net>
1  2 
dana-manual

diff --cc dana-manual
Simple merge
This page took 0.013363 seconds and 4 git commands to generate.