Merge branch 'master' of vcs.fsf.org:enc
authorCătălin Frâncu <cata@francu.com>
Fri, 20 Jun 2014 21:00:13 +0000 (00:00 +0300)
committerCătălin Frâncu <cata@francu.com>
Fri, 20 Jun 2014 21:00:13 +0000 (00:00 +0300)

Trivial merge