Merge branch 'gui'.
authorOlof-Joachim Frahm <olof@macrolet.net>
Thu, 22 Jan 2015 22:06:21 +0000 (22:06 +0000)
committerOlof-Joachim Frahm <olof@macrolet.net>
Thu, 22 Jan 2015 22:06:21 +0000 (22:06 +0000)
Seems good enough for now.


Trivial merge