Merge branch 'master' of vcs.fsf.org:enc
authorvictorhck <victorhck@Geeko.site>
Sun, 14 Feb 2016 21:00:37 +0000 (22:00 +0100)
committervictorhck <victorhck@Geeko.site>
Sun, 14 Feb 2016 21:00:37 +0000 (22:00 +0100)

Trivial merge