projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c43174 736054b)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 20 Jun 2008 15:23:56 +0000 (11:23 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 20 Jun 2008 15:23:56 +0000 (11:23 -0400)

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