From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 19 Jan 2015 21:24:33 +0000 (+0100)
Subject: Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2
X-Git-Tag: oc-android-1.7.0_signed~16^2~17
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3c79991b12536b922ec9453f5fbff9486620446c?hp=--cc

Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	owncloud-android-library
---

3c79991b12536b922ec9453f5fbff9486620446c