Merge branch 'master' into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Sat, 24 May 2014 15:13:05 +0000 (17:13 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Sat, 24 May 2014 15:13:05 +0000 (17:13 +0200)

Trivial merge