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)
bugfixMultipleSelect

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


No differences found