From 35d6f29ad3620c49874672c7b7b30a415fb1d657 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 17 Nov 2014 11:18:48 +1100
Subject: [PATCH] update rails master

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

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