projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7836f86 f05d8f4)
Merge commit 'web/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 9 Nov 2008 22:51:24 +0000 (17:51 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 9 Nov 2008 22:51:24 +0000 (17:51 -0500)

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