projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b21bae d19ed9f)
Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 3 May 2008 16:04:18 +0000 (12:04 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 3 May 2008 16:04:18 +0000 (12:04 -0400)

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