projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef17241 078917b)
Merge commit 'web/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 31 Aug 2008 21:34:18 +0000 (17:34 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 31 Aug 2008 21:34:18 +0000 (17:34 -0400)

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