projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd26d5a 056974d)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 15 Aug 2008 18:28:30 +0000 (14:28 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 15 Aug 2008 18:28:30 +0000 (14:28 -0400)

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