Merge branch 'master' of vcs.fsf.org:enc
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 17:27:08 +0000 (18:27 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 17:27:08 +0000 (18:27 +0100)
commit5ba4291e246229c052a2915c008dbf497d22beb2
tree8a2ae359ea5aeb4f7737605204241a6bf365d872
parent9176cae7a272e8b320cbaccd5c03b26c2a74eb0f
parent9eed43510ef44186700e8b167747d19c870bc340
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
static
index.html