From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 31 Oct 2013 16:30:38 +0000 (+0100)
Subject: Merge branch 'develop' into review_build_process
X-Git-Tag: oc-android-1.5.5~140^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/797d16418437966b864cefcd21ab36b358710188

Merge branch 'develop' into review_build_process
---

797d16418437966b864cefcd21ab36b358710188