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)
commit8c05bc836d9f695433e26c3b033b5a32939ca218
tree9c675836a1ca73da34ed44114f5cdc465bc6fb07
parent38a4495d64a38401734e499b3f57758d5767c7bb
parentfed2c43dc9e2b6a3c1f3110206e22b5f30c3ec9c
Merge branch 'optional_donation'