2.6.0rc1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Fixing merge conflicts from not updating VERSION
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
[CB-3739][Tizen][Tizen SDK 2.1 Nectarine]  - globalize API

provide a partial implementation using Tizen Device API

Using Device API is definitely not the right way as the support is partial
due to a lack of support of globalization from the tizen Web APIs

Tizen Web UI framework is using Globilize.js
So I will go with Globalize.js in order to provide a full support
Globalize.js was originally a jQuery plugin but is now independant as a JavaScript library
Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.9.x
[Win8][CB-3540] remove deprecated device.name
Testing non-xhr loader with Fil
more robust error handling.
Combine XHR + script injection technqieues to load the plugins list (either .json or .js file).
Testing non-xhr loader with Fil
more robust error handling.
Combine XHR + script injection technqieues to load the plugins list (either .json or .js file).
moved plugin loader script injection to a function so it can also be called when xhr fails just because the json file is not present.
moved plugin loader script injection to a function so it can also be called when xhr fails just because the json file is not present.
Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.9.x
[All] [CB-3941] [CB-3940] packaging was failing if pkg existed but pkg/debug did not.  Fixed whitespace difference between build platforms
[WindowsPhone] Remove DOMStorage Shim in WP8
[all] CB-3960 Convert Jakefile -> Gruntfile.js

Moves over all tasks except jshint. Our jshint options need updating to
work well with grunt.