From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 8 Oct 2012 07:10:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~165
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7edbe05bb524b0194d7ad9fb45bfd9d8f1250d51?hp=7edbe05bb524b0194d7ad9fb45bfd9d8f1250d51

Merge remote-tracking branch 'origin/master'

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