Merge branch 'master' of http://micah.riseup.net/git/monkeysphere
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 8 Mar 2008 23:42:34 +0000 (18:42 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 8 Mar 2008 23:42:34 +0000 (18:42 -0500)
commit5cb3545de2896f9564760fbd9615039f17998c74
treeeb5d5435333e9f1ed5c84674731cb2ed6b4e2064
parent67e617d76fce59ccbc125fa530057b97161d416a
parentecf3367ba8afbc5438d01f55bf3c7516faa7a157
Merge branch 'master' of micah.riseup.net/git/monkeysphere