Merge branch 'master' of debienna.at:debienna
authorSebastian Bachmann <me@free-minds.net>
Wed, 9 Oct 2013 11:28:21 +0000 (13:28 +0200)
committerSebastian Bachmann <me@free-minds.net>
Wed, 9 Oct 2013 11:28:21 +0000 (13:28 +0200)

Trivial merge