From: David A. Velasco <dvelasco@solidgear.es>
Date: Sat, 17 Aug 2013 08:24:42 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.4.6~20
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/782a38646d29af0f9e66410f62a6428b950fd75a?hp=-c

Merge branch 'master' into develop
---

782a38646d29af0f9e66410f62a6428b950fd75a