Merge branch 'master' of vcs.fsf.org:enc
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 10:32:53 +0000 (11:32 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 10:32:53 +0000 (11:32 +0100)
commit05bfcb9e80da6b2688a36e92429957b27bdd636b
tree505218e6dc66da9647e99b2017592b41bab66230
parentad76913cf028276f2e5f386a0ad089c8f4050bc7
parentf2e49dc1988217452aae3db7e921869ecb954eff
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
static
index.html