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

Trivial merge