Merge branch 'master' of debienna.at:debienna
authorchrysn <chrysn@fsfe.org>
Thu, 8 May 2014 14:30:37 +0000 (16:30 +0200)
committerchrysn <chrysn@fsfe.org>
Thu, 8 May 2014 14:30:37 +0000 (16:30 +0200)

Trivial merge