projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9efdaab 73d65e5)
Merge commit 'mlcastle/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 21 Jun 2008 17:53:06 +0000 (13:53 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 21 Jun 2008 17:53:06 +0000 (13:53 -0400)

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