From: Michael Meier Date: Wed, 11 Apr 2018 08:57:53 +0000 (+0200) Subject: Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?p=osmrrze.git;a=commitdiff_plain;h=3ba0a4dfa8db9b84cd4eb8a6c4877ba768e29b20 Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze --- 3ba0a4dfa8db9b84cd4eb8a6c4877ba768e29b20