Merge branch 'master' of debienna.at:debienna
authorSebastian Bachmann <me@free-minds.net>
Thu, 30 May 2013 19:18:09 +0000 (21:18 +0200)
committerSebastian Bachmann <me@free-minds.net>
Thu, 30 May 2013 19:18:09 +0000 (21:18 +0200)

Trivial merge