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
fix #352 - truncate long messages so subject is truncated

The message of the notice can be very long and mailservers will reject
emails containing such long subjects.
By truncating the message after 50 characters in the subject we avoid
these kind of problems.
Merge pull request #355 from duritong/fix/352

fix #352 - truncate long messages so subject is truncated
fixing the test of truncating the subject in the notice email
update multi_xml version to most recent one, since previous versions were unsafe like rails.

see: https://github.com/sferik/multi_xml/pull/34
Merge pull request #356 from universal/update_multi_xml

update multi_xml version to most recent one
Merge remote-tracking branch 'errbit/master'
Merge branch 'master' into deploy

Conflicts:
	Gemfile.lock