From 055e83a788c211426b641c61697973a4b7b0c37e Mon Sep 17 00:00:00 2001
From: "James A. Rosen" <james@fastly.com>
Date: Fri, 29 Apr 2016 09:59:03 -0700
Subject: [PATCH] v4.2.1

---
 Changelog.md | 5 +++++
 package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index e615b6d9..502246fc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+## 4.2.1
+
+ * use `Ember.assign` instead of `Ember.merge` if available
+ * add `no` locale support
+
 ## 4.2.0
 
  * remove `Stream` awareness from `service:i18n` to ensure streamless
diff --git a/package.json b/package.json
index 88749810..b2eb04b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-i18n",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Internationalization for Ember",
   "directories": {
     "doc": "doc",