Merge branch 'master' of vcs.fsf.org:enc-static
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 09:06:51 +0000 (10:06 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 09:06:51 +0000 (10:06 +0100)
commit585e8171d46fb1bbe2c1b10cf032d010af088e33
tree01ca310940754e28595ffc14d35ab3eff44460c3
parent2529ed2e6c5f345d7057d7eaaac4c12a532f7ba5
parent5853581d26f9ad0bc8c5e4f86f7b44bc7d99e17a
Merge branch 'master' of vcs.fsf.org:enc-static