From: Viktor Adamek <viktor@realraum.at>
Date: Mon, 30 Jun 2014 23:00:19 +0000 (+0200)
Subject: Merge branch 'master' of git.realraum.at:R3-viktor-watschn
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;p=R3-viktor-watschn.git

Merge branch 'master' of git.realraum.at:R3-viktor-watschn
---

0a0adab4de341c00dd219b46b498fbbf285bd3b2