Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 23 Sep 2009 14:35:37 +0000 (16:35 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 23 Sep 2009 14:35:37 +0000 (16:35 +0200)
commit6eb86461ee149b8a3b341165dc2d8ed1c9a502a9
treee443cc429d3550d8c12953e1e19ec5272f4fd6b9
parente5818bfcab74fea951596db7a02fd2a4f5254af8
parent2b76697346df4c7edc88b811e7d266f900fbb95a
Merge branch 'master' into cmd_unset