From 11742aed1be50239890a7cb29f794039f6a0eda0 Mon Sep 17 00:00:00 2001
From: Erik Bryn <erik.bryn@gmail.com>
Date: Mon, 27 Apr 2015 13:13:43 -0700
Subject: [PATCH] Release 0.0.15

---
 bower.json                          | 2 +-
 ember-model.js                      | 4 ++--
 package.json                        | 2 +-
 packages/ember-model/lib/version.js | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bower.json b/bower.json
index b52e80f..fdbb77c 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-model",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "main": "ember-model.js",
   "dependencies": {
     "ember": "~1.11"
diff --git a/ember-model.js b/ember-model.js
index 70bace9..e47ac9c 100644
--- a/ember-model.js
+++ b/ember-model.js
@@ -1,6 +1,6 @@
 (function() {
 
-var VERSION = '0.0.14';
+var VERSION = '0.0.15';
 
 if (Ember.libraries) {
   Ember.libraries.register('Ember Model', VERSION);
@@ -630,7 +630,7 @@ Ember.Model = Ember.Object.extend(Ember.Evented, {
     var relationships = this.constructor._relationships || [], meta = Ember.meta(this), relationshipKey, relationship, relationshipMeta, relationshipData, relationshipType;
     for (var i = 0, l = relationships.length; i < l; i++) {
       relationshipKey = relationships[i];
-      relationship = meta.descs[relationshipKey];
+      relationship = (meta.descs || this)[relationshipKey];
       relationshipMeta = relationship.meta();
 
       if (relationshipMeta.options.embedded) {
diff --git a/package.json b/package.json
index 32387e5..07c9d25 100644
--- a/package.json
+++ b/package.json
@@ -32,5 +32,5 @@
     "grunt-contrib-watch": "~0.4.4",
     "grunt-ember-s3": "~1.0.2"
   },
-  "version": "0.0.11"
+  "version": "0.0.15"
 }
diff --git a/packages/ember-model/lib/version.js b/packages/ember-model/lib/version.js
index 3e864cb..c1c0098 100644
--- a/packages/ember-model/lib/version.js
+++ b/packages/ember-model/lib/version.js
@@ -1,4 +1,4 @@
-var VERSION = '0.0.14';
+var VERSION = '0.0.15';
 
 if (Ember.libraries) {
   Ember.libraries.register('Ember Model', VERSION);