Merge branch 'master' of git+ssh://labs.riseup.net/~micah/public_git/monkeysphere
authorMicah Anderson <micah@riseup.net>
Fri, 30 Jan 2009 16:37:51 +0000 (11:37 -0500)
committerMicah Anderson <micah@riseup.net>
Fri, 30 Jan 2009 16:37:51 +0000 (11:37 -0500)
commit8e6fcc118095adc58335c594f50d367393d8f61a
treef5b7ea93c3d6f39c9221bb96523f51b009f1d9c3
parent930b0742dc2cf88015272057374ca68c94e40597
parentfed9bf92f82bac4a329866896802c3f0f8b08059
Merge branch 'master' of git+ssh://labs.riseup.net/~micah/public_git/monkeysphere

Conflicts:
doc/george/changelog
doc/george/changelog