Merge branch 'master' of debienna.at:debienna
authorSebastian Bachmann <me@free-minds.net>
Sat, 4 May 2013 12:04:20 +0000 (14:04 +0200)
committerSebastian Bachmann <me@free-minds.net>
Sat, 4 May 2013 12:04:20 +0000 (14:04 +0200)

Trivial merge