projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 752a813 a79d359)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 15 Nov 2008 21:17:44 +0000 (16:17 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 15 Nov 2008 21:17:44 +0000 (16:17 -0500)

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