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)
commitc2380f683e0d46a5bd8b4417414da84d414e7cd1
tree5ac566a2885efc0f060bde1e586d62f22d3bedb7
parentf575613bc4c97a2df1c7a4e36c386195c85a8920
parent4e04aaf14a5a2887c2d3322b99d23ff21da4148b
Merge branch 'gui'.

Seems good enough for now.