From 77d01e36aadc71cf6b757ef3e265d2b6ef51a562 Mon Sep 17 00:00:00 2001
From: Ben Toews <mastahyeti@users.noreply.github.com>
Date: Thu, 7 Jan 2016 12:35:46 -0700
Subject: add greg

---
 actionpack/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index a732622b00..69761d16b8 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -16,7 +16,7 @@
 
 *   Add option for per-form CSRF tokens.
 
-    *Ben Toews*
+    *Greg Ose & Ben Toews*
 
 *   Add tests and documentation for `ActionController::Renderers::use_renderers`.
 
-- 
cgit v1.2.3