Merge branch 'master' of vcs.fsf.org:enc
authorCătălin Frâncu <cata@francu.com>
Tue, 24 Jun 2014 07:58:36 +0000 (10:58 +0300)
committerCătălin Frâncu <cata@francu.com>
Tue, 24 Jun 2014 07:58:36 +0000 (10:58 +0300)

Trivial merge