Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 16 Oct 2015 08:42:02 +0000 (10:42 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 16 Oct 2015 08:42:02 +0000 (10:42 +0200)

Trivial merge