Marc Zinnschlag 2c1cee38b4 Merge remote-tracking branch 'smbas/feature-extended-configurator'		2015-07-28 07:56:12 +02:00
..
doc
filter
settings	Update to upstream/master. Resolve merge conflicts	2015-07-27 13:54:13 +03:00
tools
world	Merge remote-tracking branch 'smbas/fix-bug-2728'	2015-07-27 11:23:49 +02:00