Merge my local changes with upstream changes.

This commit is contained in:
Bradley M. Kuhn 2016-10-24 13:44:42 -07:00
commit 75846d7f35

View file

@ -204,11 +204,11 @@ forward to using the result.</q>
Fogel</a>, Executive Director, Fogel</a>, Executive Director,
<a href="http://QuestionCopyright.org">QuestionCopyright.org</a></p> <a href="http://QuestionCopyright.org">QuestionCopyright.org</a></p>
<p><q>As a fiscal sponsor organization with over 30 currently-associated Free <p><q>Software in the Public Interest is a fiscal sponsor for 44 free and open
Software projects, Software in the Public Interest shares the Conservancy's source projects. We share many of the accounting needs and challenges of
needs and interests in this area, and welcome the opportunity to collaborate the Conservancy and are excited to collaborate on a Free Software
on the development of a Free Software solution to our accounting needs.</q> solution to these needs and challenges.</q>
&mdash; Bdale Garbee, President, <a href="http://www.spi-inc.org/">Software &mdash; Michael Schultheiss, Treasurer, <a href="http://www.spi-inc.org/">Software
in the Public Interest</a></p> in the Public Interest</a></p>
<p><q>Open Source accounting software specifically tailored for non-profits <p><q>Open Source accounting software specifically tailored for non-profits