Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 7 Oct 2009 18:09:18 +0000 (20:09 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 7 Oct 2009 18:09:18 +0000 (20:09 +0200)
commit3aeb7f4ca4eff6f38e131848baf41d6b8c69973e
tree763c894e02a0ce53a85e8d579f9b0d76869f7eb9
parenta97fa991b9e9b5ca67e932285581c67e401d827f
parent80a896c02db35dd60de051299f09fcab522f2cb1
Merge branch 'master' into cmd_unset