projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca5d276 3caa700)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 13 Jun 2008 16:25:58 +0000 (12:25 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 13 Jun 2008 16:25:58 +0000 (12:25 -0400)

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