projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 539d6e0 a377e69)
Merge remote branch 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 18 Jan 2010 06:38:36 +0000 (01:38 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 18 Jan 2010 06:38:36 +0000 (01:38 -0500)

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