From: masensio <masensio@solidgear.es>
Date: Mon, 10 Jun 2013 11:19:11 +0000 (+0200)
Subject: Merge OC-297
X-Git-Tag: oc-android-1.4.3~22^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/472b6b48bfa33dac02d12a0d09e91dfd675569a8?hp=472b6b48bfa33dac02d12a0d09e91dfd675569a8

Merge OC-297
---