From 03094091d1ae1573f7867c887d91346356d48b6c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 14 Sep 2016 11:35:50 -0700
Subject: [PATCH 1/2] Version 2.11.2

---
 CHANGELOG.md      | 7 +++++--
 app/manifest.json | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 862bf3d7e..959524c06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,13 @@
 
 ## Current Master
 
-- Fixed bug where opening MetaMask could close a non-metamask popup.
-- Fixed memory leak that caused occasional crashes.
+## 2.12.0 2016-09-14
 
 - Add a QR button to the Account detail screen
+- Fixed bug where opening MetaMask could close a non-metamask popup.
+- Fixed memory leak that caused occasional crashes.
+- Fixed bug where some tx errors would block subsequent txs until the plugin was refreshed.
+
 ## 2.11.1 2016-09-12
 
 - Fix bug that prevented caches from being cleared in Opera.
diff --git a/app/manifest.json b/app/manifest.json
index a21e0612a..c1cbd074d 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",

From 19a354066b66c33dd5f2f1c52f94bea4525cd2d1 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 14 Sep 2016 11:38:59 -0700
Subject: [PATCH 2/2] Version 2.12.0

---
 app/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/manifest.json b/app/manifest.json
index c1cbd074d..fe4ecf4f0 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.11.2",
+  "version": "2.12.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",