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

Trivial merge