projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39f3516 4c40d9a)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 21 Aug 2008 05:46:15 +0000 (01:46 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 21 Aug 2008 05:46:15 +0000 (01:46 -0400)

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