From: masensio <masensio@solidgear.es>
Date: Tue, 25 Aug 2015 12:53:42 +0000 (+0200)
Subject: Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
X-Git-Tag: oc-android-1.8~27^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b81de1d54710175ce660753e31726fe2174301ff?hp=b81de1d54710175ce660753e31726fe2174301ff

Merge branch 'master' into create_folder_button_on_action_bar_for_uploader

Conflicts:
	res/layout/uploader_layout.xml
---