Merge branch 'master' of vcs.fsf.org:enc
authorraffael <rr@fsfe.org>
Mon, 17 Nov 2014 21:37:49 +0000 (22:37 +0100)
committerraffael <rr@fsfe.org>
Mon, 17 Nov 2014 21:37:49 +0000 (22:37 +0100)
commit7d3c9179b2216af77d0974c8f9b52c9813961de1
tree7288de892ed79fab934bd1a84045e21568bf652f
parentaeb487fae32e055b1a2fb3dff5a2f3d1055dedad
parent126dc72dadaae9c7bd02dfe1202d399bdcf9528d
Merge branch 'master' of vcs.fsf.org:enc