projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a65b42 2a8ee05)
Merge commit 'jrollins/master' monkeysphere_0.3-1
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 24 Jun 2008 05:00:31 +0000 (01:00 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 24 Jun 2008 05:00:31 +0000 (01:00 -0400)

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