Merge branch 'master' into blub/cmd_unset blub/cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 26 Feb 2010 15:18:51 +0000 (16:18 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 26 Feb 2010 15:18:51 +0000 (16:18 +0100)
commit9f329ea0b9030ff78ef83a96eb2aede7a7d1048d
treeaa08e3a1f905d4d0027c3c082ee1589d244838cb
parent7db4d9f80a07b2fd4d4dcb0946abb02e68c22151
parentef4adee42c844523c889cbc6c19d2da940f00ec6
Merge branch 'master' into blub/cmd_unset
cmd.c