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

Trivial merge