Merge branch 'beta' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 9 Nov 2015 09:53:14 +0000 (10:53 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 9 Nov 2015 09:53:14 +0000 (10:53 +0100)

Trivial merge