projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e0b85c 34af6da)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 30 Nov 2008 22:58:06 +0000 (17:58 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 30 Nov 2008 22:58:06 +0000 (17:58 -0500)

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