Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 25 Sep 2009 20:28:32 +0000 (22:28 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 25 Sep 2009 20:28:32 +0000 (22:28 +0200)
commit70a7302686fb84aa0d7be3f3dacfb55da3106f33
treece74efe27703ad8a2e6d27f1fffc11976b7538a7
parent6eb86461ee149b8a3b341165dc2d8ed1c9a502a9
parent57f2a6efbacd89bcf6b160603f18a55774640d54
Merge branch 'master' into cmd_unset