From: Sam Date: Fri, 5 Dec 2014 09:07:48 +0000 (+0100) Subject: Merge branch 'develop' of https://github.com/owncloud/android into multi2 X-Git-Tag: oc-android-1.7.0_signed~69^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c8af196f2ab6956ee21745fcb58379bbac762aaa Merge branch 'develop' of https://github.com/owncloud/android into multi2 --- c8af196f2ab6956ee21745fcb58379bbac762aaa