hinyugefuegt
hinzugefuegt 2
Merge branch 'master' of https://github.com/BeatriceFriess/qs into Zweig_A

Conflicts:
	trunk/gedicht.txt
Merge branch 'master' of https://github.com/BeatriceFriess/qs into Zweig_C

Conflicts:
	trunk/gedicht.txt
4 Zeilen fuer B hinzugefuegt
Merge branch 'master' of https://github.com/BeatriceFriess/qs into Zweig_B

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