From: jabarros Date: Mon, 3 Nov 2014 09:41:49 +0000 (+0100) Subject: Merge branch 'develop' into christmas_app X-Git-Tag: oc-android-1.7.0_signed~118^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e53c6001dde8258a6f07505dd48a34d809f68dad?ds=inline;hp=--cc Merge branch 'develop' into christmas_app --- e53c6001dde8258a6f07505dd48a34d809f68dad