From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 2 Jul 2012 08:42:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~323^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/16b5c6b9ad29bee58dec8aa301b21a2992d63d00?ds=inline;hp=-c

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

16b5c6b9ad29bee58dec8aa301b21a2992d63d00
diff --combined AndroidManifest.xml
index 0a1bac7a,bb1f30e6..65874d0b
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -18,7 -18,7 +18,7 @@@
   -->
  <manifest package="eu.alefzero.owncloud"
      android:versionCode="1"
 -    android:versionName="0.1.140B" xmlns:android="http://schemas.android.com/apk/res/android">
 +    android:versionName="0.1.141B" xmlns:android="http://schemas.android.com/apk/res/android">
  
      <uses-permission android:name="android.permission.GET_ACCOUNTS" />
      <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@@ -160,4 -160,4 +160,4 @@@
          <activity android:name="CrashlogSendActivity"></activity>
      </application>
  
- </manifest>
+ </manifest>