From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 12 Dec 2013 13:36:33 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.5.5~105
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/269cba91baab777791e0663b8c9eb53cb4b32873?hp=ba8ee979d0bf5b821ab1241706cd1f15272dccd1

Merge branch 'master' into develop
---

diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index 68eea0a0..46e92691 100644
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100010"
+    android:versionCode="0100011"
     android:versionName="1.0.11" >
 
     <uses-sdk