Merge branch 'master' of vcs.fsf.org:enc
authorCătălin Frâncu <cata@francu.com>
Fri, 20 Jun 2014 12:24:32 +0000 (15:24 +0300)
committerCătălin Frâncu <cata@francu.com>
Fri, 20 Jun 2014 12:40:36 +0000 (15:40 +0300)

Trivial merge