Merge branch 'master' of vcs.fsf.org:enc
authorVitaliy Grishenko <vitolink@gmail.com>
Sun, 22 Jun 2014 15:34:59 +0000 (19:34 +0400)
committerVitaliy Grishenko <vitolink@gmail.com>
Sun, 22 Jun 2014 15:34:59 +0000 (19:34 +0400)

Trivial merge