Nach Urlaub
Merge branch 'master' of g:/AG_GeoDaten_Anwendungen/Projekte/Master-Portal/lgv
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
wfs/wms Layer vereinheitlicht
test
thumbs.db schrott
Merge remote-tracking branch 'origin/master'

Conflicts:
	img/Thumbs.db
?