Merge branch 'master' of vcs.fsf.org:enc
authorVitaliy Grishenko <vitolink@gmail.com>
Wed, 30 Jul 2014 19:20:40 +0000 (23:20 +0400)
committerVitaliy Grishenko <vitolink@gmail.com>
Wed, 30 Jul 2014 19:20:40 +0000 (23:20 +0400)

Trivial merge