projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdbde95 28942a1)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 1 Apr 2008 02:45:38 +0000 (22:45 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 1 Apr 2008 02:45:38 +0000 (22:45 -0400)

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