projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2459fa3 5c769e7)
Merge commit 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 16 Nov 2008 05:54:29 +0000 (00:54 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 16 Nov 2008 05:54:29 +0000 (00:54 -0500)

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