projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12664ba cc637b0)
Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 14 Sep 2008 21:48:56 +0000 (17:48 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 14 Sep 2008 21:48:56 +0000 (17:48 -0400)

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