projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8cc981 1b543b6)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 3 Mar 2009 21:25:56 +0000 (16:25 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 3 Mar 2009 21:25:56 +0000 (16:25 -0500)

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