From ca7336391aba0f1c76b89381742716e98df67576 Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angularjs.org>
Date: Fri, 14 Mar 2014 23:06:04 -0700
Subject: [PATCH] chore(package.json): update karma to 0.12.0

---
 npm-shrinkwrap.json | 11 ++++-------
 package.json        |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index a72db7c9df40..a83767c438fd 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1967,7 +1967,7 @@
       }
     },
     "karma": {
-      "version": "0.11.12",
+      "version": "0.12.0",
       "dependencies": {
         "di": {
           "version": "0.0.1"
@@ -2083,9 +2083,6 @@
             }
           }
         },
-        "coffee-script": {
-          "version": "1.6.3"
-        },
         "rimraf": {
           "version": "2.2.6"
         },
@@ -2102,7 +2099,7 @@
           "version": "1.2.11"
         },
         "log4js": {
-          "version": "0.6.10",
+          "version": "0.6.12",
           "dependencies": {
             "async": {
               "version": "0.1.15"
@@ -2111,7 +2108,7 @@
               "version": "1.1.4"
             },
             "readable-stream": {
-              "version": "1.0.26",
+              "version": "1.0.26-2",
               "dependencies": {
                 "string_decoder": {
                   "version": "0.10.25-1"
@@ -2206,7 +2203,7 @@
           }
         },
         "source-map": {
-          "version": "0.1.32",
+          "version": "0.1.33",
           "dependencies": {
             "amdefine": {
               "version": "0.1.0"
diff --git a/package.json b/package.json
index c239bc2bfe8e..7d430529061d 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "q-io": "~1.10.6",
     "qq": "~0.3.5",
     "shelljs": "~0.2.6",
-    "karma": "0.11.12",
+    "karma": "^0.12.0",
     "karma-jasmine": "0.1.5",
     "karma-chrome-launcher": "0.1.2",
     "karma-firefox-launcher": "0.1.3",