projects / R3-viktor-watschn.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e4cc50 f596ac4)
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)

Trivial merge
pitsch patsch peng, watschnmaschin