From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 1 Aug 2013 16:05:54 +0000 (+0200)
Subject: Merge branch 'master' into release-1.4.4
X-Git-Tag: oc-android-1.4.6~25^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c44ab769b47db4121bec51e512d8ef83665ab3db?hp=5982973818f5319e215be1003c070745bbf9794f

Merge branch 'master' into release-1.4.4
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4ab1445a..afb89145 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="104003"
-    android:versionName="1.4.3" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="104004"
+    android:versionName="1.4.4" 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" />