Merge remote-tracking branch 'origin/devel' into locations

This commit is contained in:
Walter Julius Hennecke 2013-04-13 22:10:46 +02:00
commit ae4e2ade81

File diff suppressed because it is too large Load diff