projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d86b79c 47b47d8)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 2 Mar 2009 19:39:21 +0000 (14:39 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 2 Mar 2009 19:39:21 +0000 (14:39 -0500)

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