From e41c37fdb1fb51c6796d20c1ae36e32139d6cf56 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 27 Oct 2015 11:49:41 -0400
Subject: [PATCH] -> 0.20.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29ffe1d..a40e6be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # rollup changelog
 
+## 0.20.2
+
+* Handle errors in build config file
+* More robust deconflicting, in cases where e.g. `foo$1` already exists
+* Use Rollup CLI for own build process
+
 ## 0.20.1
 
 * Support `--config` file to enable plugins with CLI ([#226](https://github.com/rollup/rollup/pulls/226))
diff --git a/package.json b/package.json
index d862491..0cc3ed3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "0.20.1",
+  "version": "0.20.2",
   "description": "Next-generation ES6 module bundler",
   "main": "dist/rollup.js",
   "jsnext:main": "src/rollup.js",