Merge remote-tracking branch 'refs/remotes/origin/master'

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

Author: letroll

AndroidManifest.xml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.loopj.android.http"
@@ -8,4 +9,17 @@
     </application>
     <uses-sdk android:minSdkVersion="3" />
     <uses-permission android:name="android.permission.INTERNET" />
-</manifest>
+</manifest>
+=======
+<?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" />
+</manifest> 
+>>>>>>> refs/remotes/origin/master