From: Michael Meier Date: Mon, 6 Jun 2016 07:14:02 +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=13a01c22ffac04fa8f2f3499b7a9823ccfa1aba6 Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze --- 13a01c22ffac04fa8f2f3499b7a9823ccfa1aba6