commit 4afb3a824002c7588e56893c61190c1ddcbe0fdc
author Marcel Kinard <cmarcelk@gmail.com> Tue Sep 23 16:26:45 2014 -0400
committer Marcel Kinard <cmarcelk@gmail.com> Tue Sep 23 16:26:45 2014 -0400
tree c7fb13f9dd7de1b9e0f6c65304cead60c92bc54f
parent f54682fd4f7ec4f311dfd990e8f4bc1f8db71239

CB-7383 merge changes from release branch to master

RELEASENOTES.md

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2bdd628..221db71 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,15 @@
 -->
 # Cordova-cli Release Notes
 
+### 3.6.1-0.2.13 
+* update shrinkwrap
+
+### 3.6.1-0.2.12
+* CB-7383 depend on a newer version of cordova-lib
+
+### 3.6.1-0.2.11 
+* bump version to 3.6.3-0.2.11
+
 ### 3.6.1-0.2.10 (Sep 05, 2014)
 * updated Release notes
 * updated version to include dev prefix

package.json

diff --git a/package.json b/package.json
index 7039e2b..a7a1b02 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova",
-  "version": "3.6.3-0.2.12",
+  "version": "3.6.3-0.2.14-dev",
   "preferGlobal": "true",
   "description": "Cordova command line interface tool",
   "main": "cordova",
@@ -28,7 +28,7 @@
     "cli"
   ],
   "dependencies": {
-    "cordova-lib": "0.21.12",
+    "cordova-lib": "0.21.13",
     "q": "~0.9",
     "nopt": "~2",
     "underscore":"1.4.4"