Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 25 Dec 2009 17:52:36 +0000 (18:52 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 25 Dec 2009 17:52:36 +0000 (18:52 +0100)
commit38f2105ea04e8f87cbdf3791db04a371949725d8
treec7599d95fe8cb09b801eb0f813944d016bf31432
parent906594baaa7ede97c0dc4d8b2cd36c6f546c8168
parent712fb9c9eb07de1210d56d45dc1b1e2071a2887c
Merge branch 'master' into cmd_unset