Merge branch 'develop' of github.com:amooma/GS5 into develop

Conflicts:
	misc/freeswitch/scripts/dialplan/router.lua

1 files changed, 2 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index c3d86f9..9f0fe8e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,10 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.11'
 gem 'bcrypt-ruby'
 gem 'sqlite3'
 gem 'mysql2'
-gem 'cancan'
+gem 'cancan', '1.6.7'
 gem 'state_machine'
 gem 'acts_as_list'
 gem 'dalli' # memcached