projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b7c3c8 ad2ac26)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 21 Feb 2009 19:50:18 +0000 (14:50 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 21 Feb 2009 19:50:18 +0000 (14:50 -0500)

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