From 35e4eef1f4430d1571882a530467d62aeaf300e8 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sun, 2 Aug 2015 10:44:59 -0400
Subject: [PATCH] -> 0.12.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b603da..4de5c1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # rollup changelog
 
+## 0.12.1
+
+* Don't attempt to mark statements belonging to external modules ([#68](https://github.com/rollup/rollup/issues/68))
+* Correctly deshadow variables that conflict with imports ([#68](https://github.com/rollup/rollup/issues/68))
+
 ## 0.12.0
 
 * Internal re-architecting, resulting in more efficient bundling with reduced memory usage
diff --git a/package.json b/package.json
index 3e24e63..250c18d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Next-generation ES6 module bundler",
   "main": "dist/rollup.js",
   "jsnext:main": "src/rollup.js",