Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Mon, 21 Dec 2009 17:26:59 +0000 (18:26 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Mon, 21 Dec 2009 17:26:59 +0000 (18:26 +0100)
commitaba81e4bc8c2189c5f739924d2d951304df4e08a
tree1a359c47a37568263c0dce666bd1161ac790d8ac
parent5706ab61d26c7e79190205f26b0a270629f4937a
parentdeb439e4d0f954489242e932c0fefee5cc2b3f77
Merge branch 'master' into cmd_unset