Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)

No differences found