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

Trivial merge