projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d56609 9f64c35)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 23 Jun 2008 23:57:20 +0000 (19:57 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 23 Jun 2008 23:57:20 +0000 (19:57 -0400)

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