From: tomnor <tomasn@kth.se>
Date: Mon, 8 Feb 2016 21:59:42 +0000 (+0100)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f3beb6bf16f7667633a947828e8c8bd6ae1152db;p=enc.git

Merge branch 'master' of vcs.fsf.org:enc
---

f3beb6bf16f7667633a947828e8c8bd6ae1152db