projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f04744 f8776c0)
Merge commit 'mlcastle/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 19 Aug 2008 14:47:00 +0000 (10:47 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 19 Aug 2008 14:47:00 +0000 (10:47 -0400)

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