Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Fri, 21 Aug 2015 20:14:23 +0000 (16:14 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Fri, 21 Aug 2015 20:14:23 +0000 (16:14 -0400)
commit1e5d597ee33546f64b3e466e574c0ba030eda6e3
tree93234e66dc5c1609ca7dddca6a49f83adc8fdac7
parentfe337aedfc9d57d89aa662ee2c91c8cf3e1704b8
parent9a00aa77a11cf9a9e6bb7cc459a30aa7c075885d
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
en/index.html
en/index.html