Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 23 Dec 2009 10:19:24 +0000 (11:19 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 23 Dec 2009 10:19:24 +0000 (11:19 +0100)
commit4ca80813094f0ef20b858b952855c8b7d104d027
tree884cd777909457c4e5c9903b12ff7d48e871b403
parente1467e0838545cb197630db7c2884eeb678ad4f8
parent6b715e59080d753b3dad96e85f2a900cf4ef1ee1
Merge branch 'master' into cmd_unset