Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 6 Apr 2014 06:19:26 +0000 (08:19 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 6 Apr 2014 06:19:26 +0000 (08:19 +0200)
1  2 
gui.c

diff --cc gui.c
Simple merge