Merge branch 'master' into comments
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 21 Dec 2008 06:04:03 +0000 (01:04 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 21 Dec 2008 06:04:03 +0000 (01:04 -0500)
commit7304d6bd72cd2e7081287675f72fb0ded8209aaa
tree395247f03dd428a863039ee4083b52485d7a36a6
parentf8cc87e8ee68d83eced465e90e9fd657646ad3c8
parentc53a3a1d3e028e4f27acb661cc19341a13801c2b
Merge branch 'master' into comments