Merge branch 'master' of vcs.fsf.org:enc
authorVitaliy Grishenko <vitolink@gmail.com>
Wed, 25 Jun 2014 20:55:42 +0000 (00:55 +0400)
committerVitaliy Grishenko <vitolink@gmail.com>
Wed, 25 Jun 2014 20:55:42 +0000 (00:55 +0400)

Trivial merge