Merge branch 'master' of vcs.fsf.org:enc
authorquietwalker <emanuelinux@gmail.com>
Thu, 17 Jul 2014 15:15:35 +0000 (17:15 +0200)
committerquietwalker <emanuelinux@gmail.com>
Thu, 17 Jul 2014 15:15:35 +0000 (17:15 +0200)

Trivial merge