From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 30 Oct 2012 10:25:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~118
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f52780defde1d44c5ce222153134c04fd339a2c8?hp=-c

Merge remote-tracking branch 'origin/master'
---

f52780defde1d44c5ce222153134c04fd339a2c8