Merge branch 'master' into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Sat, 27 Apr 2013 14:33:55 +0000 (16:33 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Sat, 27 Apr 2013 14:33:55 +0000 (16:33 +0200)

Trivial merge