Ian Clelland dd5a337a49 Merge branch 'master' into 4.0.x ... Conflicts: framework/src/org/apache/cordova/CordovaActivity.java		2014-09-11 10:18:35 -04:00
..
cordova	Set VERSION to 3.7.0-dev (via coho)	2014-08-29 16:34:12 -07:00
project	Merge branch 'master' into 4.0.x	2014-09-11 10:18:35 -04:00