Merge branch 'master' into cooking
authorWolfgang Bumiller <blub@speed.at>
Sun, 3 Feb 2013 18:01:30 +0000 (19:01 +0100)
committerWolfgang Bumiller <blub@speed.at>
Sun, 3 Feb 2013 18:01:30 +0000 (19:01 +0100)
commitc41ef65cc92193e9b685cc123ca9d4de9d142756
treeb962e93f3644e6c26ea15a1120e6df95140b6551
parent2b51b3563409bc7e788889fd593b6e921cf817f7
parent95dd0fcd9fcd2cf35a3192c34e031d29a036b794
Merge branch 'master' into cooking
opts.c