From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 17:02:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
X-Git-Tag: beta-20151122~93
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ed763a67d304e2d90c39bbdf5b323ba10b997c2c?hp=ed763a67d304e2d90c39bbdf5b323ba10b997c2c

Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster

# Conflicts:
#	res/menu/file_actions_menu.xml
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
#	src/com/owncloud/android/utils/DisplayUtils.java
---