projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c839519 186edf2)
Merge commit 'mlcastle/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 3 May 2008 15:36:37 +0000 (11:36 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 3 May 2008 15:36:37 +0000 (11:36 -0400)

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