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

Trivial merge