Merge branch 'master' into blub/cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 29 Jan 2010 14:01:45 +0000 (15:01 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 29 Jan 2010 14:01:45 +0000 (15:01 +0100)
commit4a0ccc91f6cdcecfc712c443cb61ff6a965f5823
tree9ef0852ef9f836508b8c696b630ce2e44edd4950
parenteabf0f8d8b752be3de8e2007fab2b6f84887b13a
parentd1bef64c3e656b17e20dae840d9b16901fba9fbc
Merge branch 'master' into blub/cmd_unset