From: masensio <masensio@solidgear.es>
Date: Thu, 17 Oct 2013 16:20:38 +0000 (+0200)
Subject: Merge branch 'transifex' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/91e50a97a527a27d134836f89c01d52ffaf1c20d?ds=inline;hp=91e50a97a527a27d134836f89c01d52ffaf1c20d

Merge branch 'transifex' into setup_app_name

Conflicts:
	res/values-ko/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-tr/strings.xml
---