Unsubscribe from app. ref 14873
Minor fix
Spec comment fix
Merge branch 'errbit' into feature/upstream_merge
Merge upstream
Remove return(false) from before_filter "require_watcher_edit_priviledges"
Merge branch 'errbit' into feature/upstream_merge
Fix extract_backtraces migration, account for notices without backtrace
Allowing one to configure the secret token by giving an environment variable.

This allows you to deploy your application to heroku and not have your secret token shared with every other Errbit user.
No need to check for presence in "extract backtraces" migration
Merge pull request #334 from krautcomputing/fix_extract_backtraces_migration

Fix extract_backtraces migration, account for notices without backtrace
Merge pull request #342 from vicentemundim/master

Allowing one to configure the secret token by giving an environment variable.
Adds username and password to redmine tracker config.
Using local variable for configuring redmine tracker settings.
Fixes the url to redmine tracker project page.
added support for multiple xmpp rooms/users
added tests
Merge pull request #351 from manuelvanrijn/multiple-xmpp

Ability to add multiple users to the GTalk notification service
Update to Rails 3.2.11 and add manual backstop patches for CVE-2013-0156
Merge pull request #353 from cheald/master

Upgrade to Rails 3.2.11 with backstop patches for CVE-2013-0156