From 6f231822d5793294fb3ecd1a4cd69a10d577d7da Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 13 Nov 2014 08:56:05 +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 7eb60dad50a..283100fdeec 100644
--- a/Gemfile_master.lock
+++ b/Gemfile_master.lock
@@ -14,7 +14,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 46f172798e56ba5383ba5305e2cce5aad02e8e30
+  revision: 6ff78469cd70ce821dd1455f3607780863f5a9d7
   specs:
     actionmailer (4.2.0.beta4)
       actionpack (= 4.2.0.beta4)