Merge branch 'master' of vcs.fsf.org:enc
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 23:28:51 +0000 (00:28 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 23:28:51 +0000 (00:28 +0100)
commitc919b2d2ffa016b29378a9a86b0d83bfa3d668bb
treef116debd056b54c39025df682b695706ec294113
parentf584fc6975a1585ef315489b2fb001665f272613
parenta3e8b37b159ddbbeebec03d86fa81c493532d9e8
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
static
index.html