From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 28 Oct 2013 12:22:06 +0000 (+0100)
Subject: Merge branch 'develop' into review_build_process
X-Git-Tag: oc-android-1.5.5~140^2~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a6807cb93e193c988da5de06e30a0edd792efc4d?ds=inline

Merge branch 'develop' into review_build_process
---

a6807cb93e193c988da5de06e30a0edd792efc4d