Merge branch 'master' of git.deb.at:debienna
authorchrysn <chrysn@fsfe.org>
Thu, 21 Apr 2016 21:02:45 +0000 (23:02 +0200)
committerchrysn <chrysn@fsfe.org>
Thu, 21 Apr 2016 21:02:45 +0000 (23:02 +0200)
commitb530b8248d5ab61283ee10cb8a81cfc33642c619
treef1d2205259e40651828f3ee8ef3c941c7cf7bad4
parent2f87ee80c53fb95b593ebe63c902a0e548c2cca0
parent00b8214ce63a934f91ab2f883b66cf10bdf2e95a
Merge branch 'master' of git.deb.at:debienna