projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19b2668 4eba4e7)
merging some changes from jrollins.
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 27 May 2008 01:46:33 +0000 (21:46 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 27 May 2008 01:46:33 +0000 (21:46 -0400)

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