projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45e731a 644d0d7)
Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 29 Jul 2008 15:12:14 +0000 (11:12 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 29 Jul 2008 15:12:14 +0000 (11:12 -0400)

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