Merge branch 'master' of git.deb.at:debienna
authorchrysn <chrysn@fsfe.org>
Fri, 29 Apr 2016 10:16:14 +0000 (12:16 +0200)
committerchrysn <chrysn@fsfe.org>
Fri, 29 Apr 2016 10:16:14 +0000 (12:16 +0200)
commit89b65ac2ef87484f57be23648d96419ccc0be95c
treed810bb8a02ad8b7353bd8bf61ea9926c25d86b87
parent7f72d4736b1e553b4ad23958ebf80bcde53b074a
parent701d2d4b078a540f038169617ee6f75edbc21973
Merge branch 'master' of git.deb.at:debienna