From: Tomas <tomasn@kth.se>
Date: Sun, 6 Mar 2016 21:54:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0019cf8513d62eb47b3dd8a1103400d1373d4b0a;p=enc.git

Merge remote-tracking branch 'origin/master'
---

0019cf8513d62eb47b3dd8a1103400d1373d4b0a