Merge remote-tracking branch 'upstream/develop' into fileCount
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 24 Oct 2014 16:18:06 +0000 (18:18 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 24 Oct 2014 16:18:06 +0000 (18:18 +0200)
commitfbc3d970c565e16898eb019d7aef716521a40f10
tree18f9f2514b54f4344e2e596137045adbdf09b233
parent635394f2a2b1f007cd0b8ab16d345b3a8c7ac1c0
parent8d3a956c974661aa1a58f9083ae0af7c3e1a0ca3
Merge remote-tracking branch 'upstream/develop' into fileCount

Conflicts:
res/layout/list_fragment.xml
res/values/strings.xml
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
res/layout/list_fragment.xml
res/values/strings.xml
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java