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

Trivial merge