tree 60a14804b7c4cb51389c926013f933bdbb78d572
parent b859942eca1612234aa0c6961a769640e9dab8dd
author Marcel Kinard <cmarcelk@gmail.com> 1410893751 -0400
committer Marcel Kinard <cmarcelk@gmail.com> 1411503774 -0400

CB-7383 depend on a newer version of cordova-lib

(cherry picked from commit e305584f6c8fceed9b929ab509b86e6de14b38e3)

Conflicts:
	npm-shrinkwrap.json
	package.json