projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efd4d0b 961306e)
Merge remote branch 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 7 Feb 2010 18:18:44 +0000 (13:18 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 7 Feb 2010 18:18:44 +0000 (13:18 -0500)

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