From: Michael Meier Date: Tue, 7 Jun 2016 09:24:06 +0000 (+0200) Subject: Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?a=commitdiff_plain;h=714ac31b1c100a7fd8df08426a969823dc5d748f;p=osmrrze.git Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze --- 714ac31b1c100a7fd8df08426a969823dc5d748f