projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ef516a c6f5594)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 25 Nov 2008 17:16:16 +0000 (12:16 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 25 Nov 2008 17:16:16 +0000 (12:16 -0500)

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