projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d199f5 60b8c51)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 5 May 2008 14:56:26 +0000 (10:56 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 5 May 2008 14:56:26 +0000 (10:56 -0400)

Trivial merge
Bernie's friendly fork of http://web.monkeysphere.info/