projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9715df0 deb4113)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 17 Jun 2008 17:34:32 +0000 (13:34 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 17 Jun 2008 17:34:32 +0000 (13:34 -0400)

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