Merge branch 'master' of vcs.fsf.org:enc
authorquietwalker <emanuelinux@gmail.com>
Tue, 15 Jul 2014 11:26:12 +0000 (13:26 +0200)
committerquietwalker <emanuelinux@gmail.com>
Tue, 15 Jul 2014 11:26:12 +0000 (13:26 +0200)

Trivial merge