projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 033b0f3 b7a13e1)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 3 Sep 2008 21:02:16 +0000 (17:02 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 3 Sep 2008 21:02:16 +0000 (17:02 -0400)

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