From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 29 Oct 2013 12:56:27 +0000 (+0100)
Subject: Merge branch 'develop' into review_build_process
X-Git-Tag: oc-android-1.5.5~140^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c75e5aa71cf93e677e5abb95cb3d9c1f45a64ea7?ds=inline;hp=-c

Merge branch 'develop' into review_build_process
---

c75e5aa71cf93e677e5abb95cb3d9c1f45a64ea7