projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcf8cd7 2253eae)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 24 Jun 2008 04:50:14 +0000 (00:50 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 24 Jun 2008 04:50:14 +0000 (00:50 -0400)

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