Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 3 Jan 2010 11:52:57 +0000 (12:52 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 3 Jan 2010 11:52:57 +0000 (12:52 +0100)
commitd7ba44a412a3d80ec74bd7e3921a393bfdc931cd
treefa63bb6dbc23cdb0561c0a1a24e4863f01562627
parent34b55470e1c4e138544c1c6e70fd7f011c307aed
parenta10468a5e6140ed9658c3fd564b0f4a40ae1f111
Merge branch 'master' into cmd_unset