Merge branch 'master' of vcs.fsf.org:enc
authorCătălin Frâncu <cata@francu.com>
Sun, 22 Jun 2014 12:42:41 +0000 (15:42 +0300)
committerCătălin Frâncu <cata@francu.com>
Sun, 22 Jun 2014 12:42:41 +0000 (15:42 +0300)

Trivial merge