projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae661bf 1a17d50)
Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 16 Aug 2008 14:45:49 +0000 (10:45 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 16 Aug 2008 14:45:49 +0000 (10:45 -0400)

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