Merge branch 'optional_donation'
authorForrest Voight <forrest@forre.st>
Tue, 29 Nov 2011 05:30:28 +0000 (00:30 -0500)
committerForrest Voight <forrest@forre.st>
Tue, 29 Nov 2011 05:30:28 +0000 (00:30 -0500)

Trivial merge