From 9ef1c81fafe4dffbf3cfaaeb37e9d848b6357d8e Mon Sep 17 00:00:00 2001
From: Karma Bot <karmarunnerbot@gmail.com>
Date: Sat, 10 May 2014 19:36:04 +0000
Subject: [PATCH] chore: release v0.12.16

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b3c799d1..4cd70e858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="v0.12.16"></a>
+### v0.12.16 (2014-05-10)
+
+
+#### Bug Fixes
+
+* **launcher:** cancel kill timeout when process exits cleanly ([bd662744](http://github.com/karma-runner/karma/commit/bd662744bfbe353ccb63c7a795f691d12530129c), closes [#946](http://github.com/karma-runner/karma/issues/946))
+
 <a name="v0.12.15"></a>
 ### v0.12.15 (2014-05-08)
 
diff --git a/package.json b/package.json
index af8cf043c..38bc75fa0 100644
--- a/package.json
+++ b/package.json
@@ -191,6 +191,6 @@
   "engines": {
     "node": "~0.8 || ~0.10"
   },
-  "version": "0.12.15",
+  "version": "0.12.16",
   "license": "MIT"
 }