From: tomnor <tomasn@kth.se>
Date: Wed, 3 Feb 2016 21:43:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3e9ed5ac757daba3018c2827ff7d0f89688af77c;p=enc.git

Merge remote-tracking branch 'origin'

Need to merge so I can push.
---

3e9ed5ac757daba3018c2827ff7d0f89688af77c