Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 8 Jan 2010 13:52:41 +0000 (14:52 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 8 Jan 2010 13:52:41 +0000 (14:52 +0100)
commit7b8b0823867e57054cd111c8b6e1f09cfcc17f02
tree4bd7b71a496d3ded4b2e3c978e7b8e051de5a05b
parentd7ba44a412a3d80ec74bd7e3921a393bfdc931cd
parentb2980c1b70bd2c5a643d704a68a4868a06dbcaf6
Merge branch 'master' into cmd_unset