projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f958031 35a6f7c)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 12 Jun 2008 13:46:40 +0000 (09:46 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 12 Jun 2008 13:46:40 +0000 (09:46 -0400)

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