Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Thu, 28 Jan 2010 10:22:07 +0000 (11:22 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Thu, 28 Jan 2010 10:22:07 +0000 (11:22 +0100)
commit07798e8fc373427cf54af7c3208bbaad07e1ec1d
tree164653f412a45f52e7e6b4900ff9dcf04dbf839b
parent6729883d5ee2b3b6d08f11a482e337024f45fb8f
parent8a08fa2bc3ead266b6449b731f9a81be78ae0b56
Merge branch 'master' into cmd_unset