Peters Git server - pub/Android/ownCloud.git/commit

author	David A. Velasco <dvelasco@solidgear.es>
	Wed, 22 Apr 2015 07:35:37 +0000 (09:35 +0200)
committer	David A. Velasco <dvelasco@solidgear.es>
	Wed, 22 Apr 2015 07:35:37 +0000 (09:35 +0200)
commit	968c535e19e40bee7df8609fd050bc2196ca95e6
tree	a9eabbb89e637b317c4e213ffccad803139d7c42	tree \| snapshot (tar.gz tar.bz2 zip)
parent	70759950ba3e0ad62416283d94ae8eed14271e9c	commit \| diff
parent	f531f284fb25f7ed8646c398974d70d93726aeda	commit \| diff

Merge branch 'develop' into loging_different_servers_same_pattern

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

ownCloud Android App