From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 30 Oct 2013 12:46:14 +0000 (+0100)
Subject: Merge branch 'develop' into review_build_process
X-Git-Tag: oc-android-1.5.5~140^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cfa1b1744f4011536564b575756773c5bb47c130

Merge branch 'develop' into review_build_process
---

cfa1b1744f4011536564b575756773c5bb47c130