Merge branch 'master' of vcs.fsf.org:enc
authorlenieto3 <lenieco@gmail.com>
Tue, 24 Jun 2014 19:04:46 +0000 (14:04 -0500)
committerlenieto3 <lenieco@gmail.com>
Tue, 24 Jun 2014 19:04:46 +0000 (14:04 -0500)

Trivial merge