projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2288f6b 20e8894)
Merge commit 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 26 Oct 2008 22:58:31 +0000 (18:58 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 26 Oct 2008 22:58:31 +0000 (18:58 -0400)

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