projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41b38ac 62374dd)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 19 Feb 2009 02:32:21 +0000 (21:32 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 19 Feb 2009 02:32:21 +0000 (21:32 -0500)

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