projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90e182f 54abd85)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 28 Feb 2009 18:13:14 +0000 (13:13 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 28 Feb 2009 18:13:14 +0000 (13:13 -0500)

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