Merge remote-tracking branch 'upstream/develop' into
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 24 Oct 2014 16:44:04 +0000 (18:44 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 24 Oct 2014 16:44:04 +0000 (18:44 +0200)
commitec19a11a385ff21d3e85a94e618d48d8be9ef20d
treea7aa262dd1f84164c955355804e30d337b945210
parent712a513532b8d914dc3a39720a61bcc71b3d2408
parent8d3a956c974661aa1a58f9083ae0af7c3e1a0ca3
Merge remote-tracking branch 'upstream/develop' into
bugfixMultipleSelect

Conflicts:
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
project.properties
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java