Merge branch 'master' into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Sat, 27 Apr 2013 15:52:54 +0000 (17:52 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Sat, 27 Apr 2013 15:52:54 +0000 (17:52 +0200)
commit2058ce69a4b4e0d380aa3eb5ad4e08a9a4df7368
tree84da8fee8707523ce48dcff2a5a1237f6b435c8c
parentdc6a7436ee06bc147b6d1e6e22929b8f37c2bd48
parent4c4aa5534c34a35560ab1936bc84d37ee6e869e6
Merge branch 'master' into cooking