From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 12 Jun 2013 07:40:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~12^2~13
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8dfd6955a4acd35d2ed33075fce993587549a416

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

8dfd6955a4acd35d2ed33075fce993587549a416