projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2286a55 8a977a8)
Merge commit 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 19 Jun 2008 03:42:41 +0000 (23:42 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 19 Jun 2008 03:42:41 +0000 (23:42 -0400)

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