Ian Clelland 7caa96abcd Fix previous merges ... Build scripts (create and build) were mangled somewhat by the previous merge commits. This resets them to (almost) exactly the same state as the 3.6.x (master) branch. Conflicts: bin/lib/create.js		2014-08-20 11:45:35 -04:00
..
cordova	Fix previous merges	2014-08-20 11:45:35 -04:00
project	Merge branch 'master' into 4.0.x (Gradle library dependencies)	2014-08-20 11:43:58 -04:00