projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e760cbe 321ff6d)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 19 Feb 2009 08:01:53 +0000 (03:01 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 19 Feb 2009 08:01:53 +0000 (03:01 -0500)

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