Merge branch 'master' of vcs.fsf.org:enc-static
authorraffael <rr@fsfe.org>
Wed, 25 Jun 2014 21:40:59 +0000 (23:40 +0200)
committerraffael <rr@fsfe.org>
Wed, 25 Jun 2014 21:40:59 +0000 (23:40 +0200)
commit630fd664c5136bea63394f2a2d69b10a1cf1eb66
treed5f868d3024b9ce128d899f7db5f3046f6959da6
parent47ccf39d66ff293d330cbf1476970fb90b800054
parent5b93800b1150320f2257cd3029d00f13daf5eb56
Merge branch 'master' of vcs.fsf.org:enc-static