Merge remote-tracking branch 'origin/master' into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Mon, 7 Apr 2014 12:23:35 +0000 (14:23 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Mon, 7 Apr 2014 12:23:35 +0000 (14:23 +0200)

Trivial merge