for rails 3.1, disable xml. should be removed when merged with rails 3.2
CRYPTOPROVIDER environment variable (e.g. BCrypt). added Bace. closes gh-338
group admin can determine how/whether account balance displayed. closes gh-336
admin can specify custom logout url. closes gh-318
set group on payment error through profile. closes gh-340
use markdown for req emails, raw for admin broadcast emails. closes gh-344
style req email notification
add text version of req email notification
remove mysterious comparisons in Message#trashed? although leaving Person#trashed_messages alone as you might not want to see older trashed messages. closes gh-346
fix merge conflicts. remove disable_xml initializer
update heroku_install for master branch
attachment-fu is removed. closes gh-208
fix merge conflict
oops. heroku_install script still needs heroku credentials
upgrade to rails 3.2.12. upgrade json gem to 1.7.7
web interface does not support oauth scopes. closes gh-354
fix selecting primary and deleting profile photo. closes gh-353
Merge remote branch 'upstream/master'