From 846872d4cf5226de5733f6ad3506173fdf36bbc5 Mon Sep 17 00:00:00 2001
From: Ryan O'Neill <roneill@twitter.com>
Date: Wed, 5 Aug 2015 15:59:43 -0700
Subject: [PATCH] master mege

---
 NEWS.md   | 20 ++++++++++++++++++++
 README.md |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 904fc839..bba1310e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -18,6 +18,26 @@ Thank you to contributors with commits since v1.3.0-M2 tag:
 
 - Preben Ingvaldsen
 
+# 1.3.0-M3: April 21, 2015
+
+- this is an ABI-not-guaranteed beta release in advance
+  of 1.3.0. Please see the notes for 1.3.0-M1 below for warnings,
+  caveats, and the bulk of what's changed since 1.2.1.
+
+API changes (since 1.3.0-M2):
+
+- renamed some methods in the new ConfigDocument for consistency
+  with Config (breaks ABI vs. 1.3.0-M2, but not vs. any stable
+  release)
+
+Fixes:
+
+- couple of bugfixes in ConfigDocument
+
+Thank you to contributors with commits since v1.3.0-M2 tag:
+
+- Preben Ingvaldsen
+
 # 1.3.0-M2: April 1, 2015
 
 - not in fact an April Fool's joke. Unless it's broken. Then it
diff --git a/README.md b/README.md
index 747a4747..2fb87e5a 100644
--- a/README.md
+++ b/README.md
@@ -817,4 +817,4 @@ format.
 
 #### Python port
 
-   * pyhocon https://github.com/chimpler/pyhocon
+   * pyhocon https://github.com/chimpler/pyhocon
\ No newline at end of file