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

diff --cc cmd.c
Simple merge