From: Olof-Joachim Frahm <olof@macrolet.net>
Date: Thu, 22 Jan 2015 22:06:21 +0000 (+0000)
Subject: Merge branch 'gui'.
X-Git-Tag: 0.1.0~2
X-Git-Url: http://repo.macrolet.net/gitweb/?p=crypto-install.git;a=commitdiff_plain;h=c2380f683e0d46a5bd8b4417414da84d414e7cd1

Merge branch 'gui'.

Seems good enough for now.
---

c2380f683e0d46a5bd8b4417414da84d414e7cd1