Merge branch 'master' into git-anon
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 23 Oct 2008 17:45:42 +0000 (13:45 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 23 Oct 2008 17:45:42 +0000 (13:45 -0400)
commitbdbbca09c3a18510429934ffbad846ae64d7edce
treea14bc7ab1f22d0a02475602019c4e8881c803530
parent094af3d113f375f7faf2abf283615582a9977a65
parent534f7144782ba6a453d5befed4faa7d6657d5fdc
Merge branch 'master' into git-anon