Merge branch 'master' into recentchanges
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jan 2008 02:24:15 +0000 (21:24 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jan 2008 02:24:15 +0000 (21:24 -0500)
commit0f95adbd1d33e267b9654c80ef2d38ca06407ecb
treec2e4888e24959951a82fed48ec6b24bc15e89e0f
parent3436fed08169893953fef6858f7645437f39d1b0
parente30b96babacb6ac48e571105c9f0627f68cf3bca
Merge branch 'master' into recentchanges