Merge branch 'master' of vcs.fsf.org:enc
authorraffael <rr@fsfe.org>
Sun, 13 Jul 2014 21:38:08 +0000 (23:38 +0200)
committerraffael <rr@fsfe.org>
Sun, 13 Jul 2014 21:38:08 +0000 (23:38 +0200)
commit2cc234b5b59aa90046ebf9a831fb8b0293a8e910
treed62189fab129785b694f6ab7d84e40faf8e1b50b
parent5731f8d8486337d1bf840eb8c51cea51d2c18b94
parent2c1d7f9c790c333195b549cc426be714cddfd723
Merge branch 'master' of vcs.fsf.org:enc