deleted trunk/gedicht.txt
St.Nikolaus added
neue Strophe
tztr
Merge branch 'master' of https://github.com/GTarkin/sewuq into Zweig_C

Conflicts:
	trunk/gedicht.txt
Merge remote-tracking branch 'remotes/origin/Zweig_A'

Conflicts:
	trunk/gedicht.txt
Merge remote-tracking branch 'remotes/origin/Zweig_B'

Conflicts:
	trunk/gedicht.txt
Merge remote-tracking branch 'remotes/origin/Zweig_C'

Conflicts:
	trunk/gedicht.txt