From: masensio <masensio@solidgear.es>
Date: Tue, 16 Jul 2013 07:05:34 +0000 (+0200)
Subject: Merge branch 'master' into release-1.4.2
X-Git-Tag: oc-android-1.4.3~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c7188eb833a3e1c7c514ad8ec36b90010896acfd?hp=--cc

Merge branch 'master' into release-1.4.2
---

c7188eb833a3e1c7c514ad8ec36b90010896acfd