Merge branch 'hotfix/0.6.9.2'
Upgrade JSON gem to get fix for CVE-2013-0269. Update to latest Rails 2-3 series - has fixes for CVE-2013-0277, CVE-2013-0276, although alaveteli does not use attr_protected or serialize.
Merge branch 'hotfix/0.6.9.3'
Latest translations from transifex.
Merge branch 'release/0.7'
Fix for #808. SafeBuffer and ActionMailer::Quoting.quoted_printable don't play well together, so convert all subject lines to strings before passing them off to actionmailer.
Handle the case where the subject is not set
Merge branch 'hotfix/0.7.0.1' into develop