projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c911568 b75cb97)
Merge commit 'mjgoins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 22 Jun 2008 04:27:16 +0000 (00:27 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 22 Jun 2008 04:27:16 +0000 (00:27 -0400)

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