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.
Allow cap rake:themes:install to be run standalone and in the context of a deploy. According to https://github.com/capistrano/capistrano/blob/master/lib/capistrano/recipes/deploy.rb#L75 'latest_release' seems to fit the bill.
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'
Merge branch 'release/0.6.9' into develop

Conflicts:
    Gemfile.lock
    locale/cy/app.po
Update lock to latest copy of rails - 2.3.15
Update lock to latest copy of rails - 2.3.15
Even in development, bundle should be installed in the vendor directory. Fixes #730. Capistrano-based deploys don't use rails-post-deploy, so I don't think this will be a problem for them.
Merge branch 'feature/standalone_cap_theme_install' into develop
Small comment edit in timezone_fixes to remind that this can be removed in Rails 3.x
Remove mongrel_proctitle plugin because the standard configuration now uses passenger rather than mongrel
Merge remote-tracking branch 'openaustralia_github/remove_mongrel_proctitle' into develop