Merge branch 'master' of vcs.fsf.org:enc-static
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Mon, 16 Jun 2014 19:16:03 +0000 (20:16 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Mon, 16 Jun 2014 19:16:03 +0000 (20:16 +0100)
commit65133c6622057b228af8ebaa01216eda8ceed004
treedf3186d7b6f212d1efca32d697c273d027853741
parent0291df76a63c8040b5c84cb4ab31930589446328
parentb99cae6fa505638df769bfa7bcad84a2d17a6297
Merge branch 'master' of vcs.fsf.org:enc-static