Merge branch 'master' of vcs.fsf.org:enc
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Thu, 5 Jun 2014 02:03:48 +0000 (03:03 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Thu, 5 Jun 2014 02:03:48 +0000 (03:03 +0100)
commit768f64fe632500e18e1c60aa90ff7f4af59c481f
tree9429da3e8f8177654c7fb28d7460ddf0892fd68c
parente2b1c33a84bdd43d0e63ea16a94d3117c27a30de
parent1bca586c2980c5c4aaa5a6790953877ebcc93a29
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
static
index.html