projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b399dbc 647a0fc)
Merge commit 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 18 Nov 2008 06:51:33 +0000 (01:51 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 18 Nov 2008 06:51:33 +0000 (01:51 -0500)

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