Merge branch 'master' of vcs.fsf.org:enc
authorThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 22:24:33 +0000 (19:24 -0300)
committerThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 22:24:33 +0000 (19:24 -0300)
commit87c2ba1a69baf360fc6a2e4506b38a05cbea1d9b
tree6c153fb048baad857eab2fb79bce123d86395d0e
parent0db3739f93bbdf1ce1c1fc8c54b73bad147e8c3a
parent14f29fadab664c33069e54251c41336b0f28581b
Merge branch 'master' of vcs.fsf.org:enc