Merge branch 'master' of debienna.at:debienna
authorSebastian Bachmann <me@free-minds.net>
Thu, 7 Aug 2014 19:59:39 +0000 (21:59 +0200)
committerSebastian Bachmann <me@free-minds.net>
Thu, 7 Aug 2014 19:59:39 +0000 (21:59 +0200)

Trivial merge