projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a34147 a7b3286)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 26 Oct 2008 22:47:19 +0000 (18:47 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 26 Oct 2008 22:47:19 +0000 (18:47 -0400)

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