Andrew Grieve f38c460588 Merge branch 'master' into 4.0.x (Unbreak unit tests) ...

Conflicts:
	test/src/org/apache/cordova/test/junit/GapClientTest.java
	test/src/org/apache/cordova/test/userwebview.java
	test/src/org/apache/cordova/test/whitelist.java

2014-07-10 10:30:05 -04:00

..

com/squareup/okhttp

CB-6818: I want to remove this code, because Square didn't do their headers properly

2014-06-03 15:22:10 -07:00

org/apache/cordova

Merge branch 'master' into 4.0.x (Unbreak unit tests)

2014-07-10 10:30:05 -04:00