# HG changeset patch
# User Chris Cannam
# Date 1389023639 0
# Node ID 926dce5f57787263268cc5064faf6ce59a3df790
# Parent  46a444fa87bc184b2af8b2f71498711011a14cd3# Parent  cf78a7ade302a8b7c5ae894f3d7d3fafdcd5ca9d
Merge fix from luisf branch

diff -r cf78a7ade302 -r 926dce5f5778 Gemfile
--- a/Gemfile	Mon Nov 11 18:25:50 2013 +0000
+++ b/Gemfile	Mon Jan 06 15:53:59 2014 +0000
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem "rails", "3.2.13"
+gem "rails", "3.2.16"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem "coderay", "~> 1.0.6"