From: jabarros <jabarros@solidgear.es>
Date: Thu, 7 Aug 2014 15:34:15 +0000 (+0200)
Subject: Merge branch 'develop' into accounts_view
X-Git-Tag: oc-android-1.7.0_signed~227^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b154fba6ee7e2dfb77ff10e20c20c080758d2a1d?hp=b154fba6ee7e2dfb77ff10e20c20c080758d2a1d

Merge branch 'develop' into accounts_view

Conflicts:
	res/values/strings.xml
---