Merge branch 'master' into darcs
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 15 Oct 2008 23:36:48 +0000 (19:36 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 15 Oct 2008 23:36:48 +0000 (19:36 -0400)
commit1f7f5d5e0e21920c5f15290cd34594ad91077071
treea19302c57ed6ea46c4bf05a1ed8d840725643069
parent917f54a777d152ee5963acd81bf8a2800a0507b1
parent20e691fe20ead76d826ab77501c6e9cbc7b487e8
Merge branch 'master' into darcs