Merge branch 'cooking' of git://github.com/graphitemaster/gmqcc into cooking
authorWolfgang Bumiller <blub@speed.at>
Fri, 1 Feb 2013 18:12:45 +0000 (19:12 +0100)
committerWolfgang Bumiller <blub@speed.at>
Fri, 1 Feb 2013 18:12:45 +0000 (19:12 +0100)

Trivial merge