From: jabarros <jabarros@solidgear.es>
Date: Wed, 17 Sep 2014 07:47:34 +0000 (+0200)
Subject: Merge branch 'develop' into better_loggin_system
X-Git-Tag: oc-android-1.7.0_signed~176^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2ef886af316609c2e4a1fe5f2ee32345a8008e33?ds=inline;hp=2ef886af316609c2e4a1fe5f2ee32345a8008e33

Merge branch 'develop' into better_loggin_system
---