From: Michael 'PoempelFox' Meier <git@mulder.franken.de>
Date: Sat, 25 Jul 2015 05:47:18 +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=419be1d8d1ea54cb41cc57c09730f5c9fd5c4151

Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze
---

419be1d8d1ea54cb41cc57c09730f5c9fd5c4151