Merge branch 'master' into develop

author jabarros <jabarros@solidgear.es>

Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)

committer jabarros <jabarros@solidgear.es>

Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)
author jabarros <jabarros@solidgear.es>
Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)
committer jabarros <jabarros@solidgear.es>
Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)
diff --cc owncloud-android-library

index c29631b,d709798..5bd0d73
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit c29631b8bfea22e5f0b448aab8ffff959ae4de66
- -Subproject commit d7097983594347167b5bde3fa5b2b4ad1d843392
++Subproject commit 5bd0d7387712ce3f53869294761ac4d8537841cd
diff --cc res/values/strings.xml
Simple merge
author	jabarros <jabarros@solidgear.es>
	Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)
committer	jabarros <jabarros@solidgear.es>
	Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)
		1	2
owncloud-android-library	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history