Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 27 Sep 2009 14:05:13 +0000 (16:05 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 27 Sep 2009 14:05:13 +0000 (16:05 +0200)
commit0966b0b450a5168c2b5ab7591e43119a01728f45
tree35fc8b0533069b06c9caa681107cab918e08b73e
parent70a7302686fb84aa0d7be3f3dacfb55da3106f33
parent41f977c7ca47d0d2b702614e67c33af751d11cbe
Merge branch 'master' into cmd_unset