Merge branch 'master' of git://github.com/graphitemaster/gmqcc
authorWolfgang Bumiller <blub@speed.at>
Fri, 4 Jan 2013 13:52:00 +0000 (14:52 +0100)
committerWolfgang Bumiller <blub@speed.at>
Fri, 4 Jan 2013 13:52:00 +0000 (14:52 +0100)

Trivial merge