projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10100ce 8dd86c4)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 11 Jun 2008 21:10:01 +0000 (17:10 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 11 Jun 2008 21:10:01 +0000 (17:10 -0400)

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