Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 9 Oct 2015 12:45:32 +0000 (14:45 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 9 Oct 2015 12:45:32 +0000 (14:45 +0200)

Trivial merge