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

Merge branch 'develop' into review_build_process
---

ae179c4686413e3ab441339214d8b531c6859a26