From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 28 Oct 2013 11:52:20 +0000 (+0100)
Subject: Merge branch 'develop' into review_build_process
X-Git-Tag: oc-android-1.5.5~140^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/586ef8ad2d3e8f16bcaffe1f9152db1eaa7a11fe

Merge branch 'develop' into review_build_process
---

586ef8ad2d3e8f16bcaffe1f9152db1eaa7a11fe