From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 15 Jun 2015 11:43:17 +0000 (+0200)
Subject: Merge branch 'develop' into navigationDrawer_basic
X-Git-Tag: oc-android-1.7.2~1^2~23^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/66f3a45d050c27e41296ddc9083d968cfd8803a4?hp=66f3a45d050c27e41296ddc9083d968cfd8803a4

Merge branch 'develop' into navigationDrawer_basic

Conflicts FIXED:
	res/layout/files.xml
---