From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 22 Apr 2015 07:35:37 +0000 (+0200)
Subject: Merge branch 'develop' into loging_different_servers_same_pattern
X-Git-Tag: test~30^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/968c535e19e40bee7df8609fd050bc2196ca95e6?ds=inline;hp=968c535e19e40bee7df8609fd050bc2196ca95e6

Merge branch 'develop' into loging_different_servers_same_pattern

Conflicts SOLVED in:
	src/com/owncloud/android/ui/activity/FileActivity.java
---