Merge branch 'master' of git.deb.at:debienna
authorchrysn <chrysn@fsfe.org>
Mon, 25 Apr 2016 15:57:51 +0000 (17:57 +0200)
committerchrysn <chrysn@fsfe.org>
Mon, 25 Apr 2016 15:57:51 +0000 (17:57 +0200)
commitc37d29e4bbe5838dbebd1e1018607d34ab12c771
treefa746cc4a456422a9b9068648e855782ecfb208d
parent2c4138a2a74f54ee8d29cd798e85fd07db3f767c
parentbbd749864497e42c65622c4a5d2a240bf18619fb
Merge branch 'master' of git.deb.at:debienna