Merge branch 'master' of vcs.fsf.org:enc
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Thu, 5 Jun 2014 00:15:15 +0000 (01:15 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Thu, 5 Jun 2014 00:15:15 +0000 (01:15 +0100)
commit778fb3314913345479a52b0b8c55974dae6f4043
tree355be364a8b517062e118f111cd32c35ee133836
parent7e60af07c03b45a456128561359ed87a2e364c67
parentf65fbc20e45697ed21ba9e635946a37c8c1bbc95
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
static
index.html
infographic.html