Merge branch 'master' into blub/cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Mon, 1 Feb 2010 17:13:30 +0000 (18:13 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Mon, 1 Feb 2010 17:13:30 +0000 (18:13 +0100)
commit7db4d9f80a07b2fd4d4dcb0946abb02e68c22151
treed9d149d302936e0a8bf21d9817de5a72c1568607
parent4a0ccc91f6cdcecfc712c443cb61ff6a965f5823
parent93783908b793eb2f1df1e705cc7d29489cf409b3
Merge branch 'master' into blub/cmd_unset
cmd.c