Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Thu, 22 Oct 2009 13:11:51 +0000 (15:11 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Thu, 22 Oct 2009 13:11:51 +0000 (15:11 +0200)
1  2 
cvar.c

diff --cc cvar.c
Simple merge