Merge branch 'master' of vcs.fsf.org:enc
authorlucastx <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 20:55:26 +0000 (17:55 -0300)
committerlucastx <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 20:55:26 +0000 (17:55 -0300)
commita97a6445e54a6bc12432b5c941d19ac176631943
tree136965d32bd788c9f4a8871ebe0855a2134dd09e
parent062d7a82bf23bcefb50c334de4da650dd2c3645c
parent72e8c1bcbb6dfd22e266300ba89ff88bf0942046
Merge branch 'master' of vcs.fsf.org:enc