Merge branch 'cooking' of git://github.com/graphitemaster/gmqcc into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Tue, 4 Jun 2013 18:36:58 +0000 (20:36 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Tue, 4 Jun 2013 18:36:58 +0000 (20:36 +0200)

Trivial merge