Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Mon, 28 Sep 2009 13:24:44 +0000 (15:24 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Mon, 28 Sep 2009 13:24:44 +0000 (15:24 +0200)
commit6c006b8da9c9fabbd384a7668a9ed303462b6bf8
treebc135bb2e420023244227a12e869e8eeede270a9
parent0966b0b450a5168c2b5ab7591e43119a01728f45
parenta91fde3c4dbd4ef9efb034de2b69cc0c425b1707
Merge branch 'master' into cmd_unset