Merge branch 'master' into cooking
authorWolfgang Bumiller <blub@speed.at>
Fri, 25 Jan 2013 15:03:38 +0000 (16:03 +0100)
committerWolfgang Bumiller <blub@speed.at>
Fri, 25 Jan 2013 15:03:38 +0000 (16:03 +0100)

Trivial merge