projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c584f33 b9f298a)
Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 28 Aug 2008 03:48:55 +0000 (23:48 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 28 Aug 2008 03:48:55 +0000 (23:48 -0400)

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