Merge branch 'master' of git.realraum.at:R3-viktor-watschn master
authorViktor Adamek <viktor@realraum.at>
Mon, 30 Jun 2014 23:00:19 +0000 (01:00 +0200)
committerViktor Adamek <viktor@realraum.at>
Mon, 30 Jun 2014 23:00:19 +0000 (01:00 +0200)
commit0a0adab4de341c00dd219b46b498fbbf285bd3b2
tree64b5e0aa9d541154d41f0917912171cb7092d675
parent4e4cc5051eae9c03fe296306ea9ed85b9f409f24
parentf596ac4df0a67e7fff78fc3d0d9f9f12c3d1f9c8
Merge branch 'master' of git.realraum.at:R3-viktor-watschn