From 47697639f42eb95da90047a2278011808103c41f Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@pobox.com>
Date: Fri, 2 May 2014 10:49:31 -0400
Subject: [PATCH] add 1.2.1 to NEWS

---
 NEWS.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index c949f10b..ffaab764 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,17 @@
+# 1.2.1: May 2, 2014
+
+- bugfix release, no API additions or changes
+- fix resolving substitutions in include statements nested inside
+  objects
+- when rendering an object to a string, sort the fields
+- handle unresolved substitutions in value concatenations
+- make ConfigOrigin.comments unmodifiable
+- when using '+=' or 'include' inside a list, throw an exception
+  instead of generating a wrong result
+- when context class loader is unset throw a more helpful
+  exception than NullPointerException
+- ignore non-string values in a Properties object
+
 # 1.2.0: January 15, 2014
 
  - new stable ABI release (binary compatible with 1.0.x; a few new APIs)