Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 11 Oct 2009 12:58:10 +0000 (14:58 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 11 Oct 2009 12:58:10 +0000 (14:58 +0200)
commit2e24c2ea1ff272451e1c48327c6125cc35fd7f94
tree30d8a4e09173ca47b9b6bdf5323fdbff04380670
parent3aeb7f4ca4eff6f38e131848baf41d6b8c69973e
parentd7ebc633e565d1767312dab70793948b9c4efd75
Merge branch 'master' into cmd_unset