projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f39ffc eeaa6fa)
Merge commit 'web/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 5 Sep 2008 04:39:05 +0000 (00:39 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 5 Sep 2008 04:39:05 +0000 (00:39 -0400)

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