projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea04bff 280c55f)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 11 Apr 2008 17:20:55 +0000 (13:20 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 11 Apr 2008 17:20:55 +0000 (13:20 -0400)

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