Merge branch 'master' of vcs.fsf.org:enc
authorVitaliy Grishenko <vitolink@gmail.com>
Sat, 21 Jun 2014 18:08:31 +0000 (22:08 +0400)
committerVitaliy Grishenko <vitolink@gmail.com>
Sat, 21 Jun 2014 18:08:31 +0000 (22:08 +0400)

Trivial merge