Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	src/com/loopj/android/http/AsyncHttpClient.java

Author: letroll

AndroidManifest.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.loopj.android.http"
-    android:versionName="1.4.1"
-    android:versionCode="1">
-    <application
-        android:name="android_async_http">
-    </application>
-    <uses-sdk android:minSdkVersion="3" />
-    <uses-permission android:name="android.permission.INTERNET" />
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.loopj.android.http"
+    android:versionName="1.4.3"
+    android:versionCode="1">
+    <application
+        android:name="android_async_http">
+    </application>
+    <uses-sdk android:minSdkVersion="3" />
+    <uses-permission android:name="android.permission.INTERNET" />
 </manifest>