Merge branch 'master' of debienna.at:debienna
authorSebastian Bachmann <me@free-minds.net>
Sun, 12 Jan 2014 12:38:31 +0000 (13:38 +0100)
committerSebastian Bachmann <me@free-minds.net>
Sun, 12 Jan 2014 12:38:31 +0000 (13:38 +0100)

Trivial merge