merge
merge
Merge branch 'master' of
ssh://git@localhost:66/pellepelster/myadmin-examples.git

Conflicts:
	org.example.newsletter.build/ant/myadmin/ivysettings-myadmin-base.xml