Merge branch 'master' of vcs.fsf.org:enc
authorCătălin Frâncu <cata@francu.com>
Wed, 25 Jun 2014 13:19:49 +0000 (16:19 +0300)
committerCătălin Frâncu <cata@francu.com>
Wed, 25 Jun 2014 13:19:49 +0000 (16:19 +0300)

Trivial merge