Andrew Grieve 6abb9da88a Merge branch 'master' into 4.0.x ... Conflicts: bin/templates/project/custom_rules.xml framework/src/org/apache/cordova/CordovaWebView.java test/src/org/apache/cordova/test/junit/MessageTest.java		2014-06-08 22:54:21 -04:00
..
cordova	Merge branch 'master' into 4.0.x	2014-06-08 22:54:21 -04:00
project	Merge branch 'master' into 4.0.x	2014-06-08 22:54:21 -04:00