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)
1  2 
cmd.c

diff --cc cmd.c
Simple merge