Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Thu, 1 Oct 2009 17:26:37 +0000 (19:26 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Thu, 1 Oct 2009 17:26:37 +0000 (19:26 +0200)
commita97fa991b9e9b5ca67e932285581c67e401d827f
treed60c3944e0a882461ed12632ffd098d244b7c471
parent6c006b8da9c9fabbd384a7668a9ed303462b6bf8
parent58eab13c07cc60570bb94d0a511ae57433f0019c
Merge branch 'master' into cmd_unset