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)
commit56df9bb38aa4725f9244a7898d765608d8a1fffa
tree5d0d53db0c92e859369376c4cbdd43f215738eda
parentf299d434d44ea21e598396d163b2b1be5ba8d4a0
parentb0cbef19d0c704d570f42f8de80fe43664ada9f0
Merge branch 'maint'
gui.c