projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7e520c 1b4c351)
Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 5 Aug 2008 19:45:50 +0000 (15:45 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 5 Aug 2008 19:45:50 +0000 (15:45 -0400)

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