projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa2aeb6 3a8b658)
Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 5 Sep 2008 15:31:23 +0000 (11:31 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 5 Sep 2008 15:31:23 +0000 (11:31 -0400)

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