From c980f2b976eeddd1a6e5008b44a7ea9cdffc2451 Mon Sep 17 00:00:00 2001
From: Chris Engebretson <cengebretson@globalvetlink.com>
Date: Mon, 25 Mar 2013 10:42:28 -0500
Subject: [PATCH] make sure spine.js is generated from latest pull request

---
 lib/spine.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/spine.js b/lib/spine.js
index a6286be5..ebeb0ef4 100644
--- a/lib/spine.js
+++ b/lib/spine.js
@@ -800,7 +800,7 @@
 
     function Controller(options) {
       this.release = __bind(this.release, this);
-      var key, value, _ref;
+      var key, parent_prototype, value, _ref;
 
       this.options = options;
       _ref = this.options;
@@ -825,6 +825,14 @@
       if (!this.elements) {
         this.elements = this.constructor.elements;
       }
+      if (parent_prototype = this.constructor.__super__) {
+        if (parent_prototype.events) {
+          this.events = $.extend({}, parent_prototype.events, this.events);
+        }
+        if (parent_prototype.elements) {
+          this.elements = $.extend({}, parent_prototype.elements, this.elements);
+        }
+      }
       if (this.events) {
         this.delegateEvents(this.events);
       }