projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c5d7c0 1491976)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 12 Jul 2009 18:27:13 +0000 (14:27 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 12 Jul 2009 18:27:13 +0000 (14:27 -0400)

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