From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 3 May 2013 08:24:20 +0000 (+0200)
Subject: Merge branch 'develop' into oauth_login
X-Git-Tag: oc-android-1.4.3~29^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9b4da8439ad53a28a45bdca5caed77774c5baad8?ds=inline;hp=9b4da8439ad53a28a45bdca5caed77774c5baad8

Merge branch 'develop' into oauth_login

Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
---