C_change
A_change_newPoeme
B_change_newPoeme
Merge remote-tracking branch 'remotes/origin/Zweig_A'
Merge remote-tracking branch 'remotes/origin/Zweig_B'

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

Conflicts:
	trunk/gedicht.txt