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)
commit9ace0811ce3eaf8a7a62664a4a6ed483a6c00a67
treebdcb18d5cdad8cf53c6f6f34bdd529d7559d0e2f
parent18cf3641b1e18a8c7ae36d8f9dd770fb48c191c4
parentd4b0e1f588cb033cd4400cde4bbc4357c1776f94
Merge branch 'master' into cooking