Merge branch 'master' into develop
authorjabarros <jabarros@solidgear.es>
Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)
committerjabarros <jabarros@solidgear.es>
Mon, 20 Oct 2014 12:54:46 +0000 (14:54 +0200)
commit3a8ff76d0a68d0ba18513c177b69bb8cb38e4189
treecd80bb295a5e8602b299cfe01a0e17371f00de7d
parent6ed394195d05b5b36c93ac8f112ff0dd50693af8
parenta2c91af7f5b79ba206decc55ebe5ae08f5d64148
Merge branch 'master' into develop

Conflicts:
owncloud-android-library
owncloud-android-library
res/values/strings.xml