From 6ca87d281d9e1a62ce494321b9e74b017a675700 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 14 Nov 2014 14:42:44 +1100
Subject: [PATCH] update rails

---
 Gemfile_master.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile_master.lock b/Gemfile_master.lock
index 283100fdeec..4126826d222 100644
--- a/Gemfile_master.lock
+++ b/Gemfile_master.lock
@@ -14,7 +14,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 6ff78469cd70ce821dd1455f3607780863f5a9d7
+  revision: aeb917d475dfccb8b5f3b5a57f62df5358ad3ef0
   specs:
     actionmailer (4.2.0.beta4)
       actionpack (= 4.2.0.beta4)