no alert
Merge remote-tracking branch 'origin/master' into eugen_Maven_Script
Merge remote-tracking branch 'origin/master' into eugen_Maven_Script
Merge remote-tracking branch 'origin/master' into eugen_Maven_Script
Merge branch 'eugen_Maven_Script' of github.com:xwic/jWic into eugen_Maven_Script
Merge remote-tracking branch 'origin/master' into eugen_Maven_Script

Conflicts:
	de.jwic.controls/src/de/jwic/controls/ListBox.vtl
Merge remote-tracking branch 'origin/master' into eugen_Maven_Script
Merge remote-tracking branch 'origin/eugen_Maven_Script'