projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad44601 c1924de)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 18 Feb 2009 04:33:55 +0000 (23:33 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 18 Feb 2009 04:33:55 +0000 (23:33 -0500)

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