Merge branch 'master' into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Sat, 8 Feb 2014 09:33:50 +0000 (10:33 +0100)
committerWolfgang Bumiller <wry.git@bumiller.com>
Sat, 8 Feb 2014 09:33:50 +0000 (10:33 +0100)

Trivial merge