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)
commitc4e9ea702c678413b9e7318fc032448d3dd4ad4e
tree5f697a4375c47630c6f4821c7f5b17294be34a75
parent07457aec3a8218be07bf698a2ed361f64f15a0a1
parentbee5e241ab8e8575aba4a1c410f5023b6305ade9
Merge branch 'update'

* update:
  Kleine Formulierungsaenderungen.
  Kleine Aenderungen.
  Neuer Abschnitt: Loeschungen u.a. Aenderungen (7.)

Conflicts:
dana-manual

Signed-off-by: Thomas Hochstein <thh@inter.net>
dana-manual
This page took 0.010556 seconds and 4 git commands to generate.