Add release notes for 0.6.9
Merge branch 'hotfix/0.6.8.3'
Merge branch 'hotfix/0.6.8.3' into release/0.6.9

Conflicts:
    Gemfile.lock
    locale/ar/app.po
    locale/cs/app.po
    locale/cy/app.po
    locale/en_IE/app.po
    locale/es/app.po
    locale/pt_BR/app.po
Latest translations pulled from Transifex to fix inadvertantly committed unmerged conflicted files.
Bump Alaveteli release number.
Latest translations pulled from Transifex.
Update Gemfile to use a security patched copy of rails from the mySociety git repo
Add updated Gemfile.lock after running bundle install.
Add note on Rails security upgrades to change file.
Try just specifying that rails should come from git, to avoid deprecation warnings about "require 'actionmailer'" rather than "require 'action_mailer'" etc.
Merge branch 'release/0.6.9'
Update lock to latest copy of rails - 2.3.15
Upgrade Rails to version 2.3.16 to get fix for CVE-2013-0333.
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.
Fix a security vulnerability: eval used in quoting display name

This use of eval allows arbitrary remote code execution on
parsing of a maliciously formed email.
Merge tag '0.6.9.4' into develop

0.6.9.4

Conflicts:
	Gemfile.lock
	locale/cs/app.po
	locale/cy/app.po
	locale/pt_BR/app.po
	locale/ro_RO/app.po