From: Michael Meier Date: Thu, 2 Jun 2016 15:30:48 +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=fb2061706a9337f25651b76f488e32ad8ab7041e Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze --- fb2061706a9337f25651b76f488e32ad8ab7041e