Merge branch 'notification_coloring' of https://github.com/owncloud/android into...
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 27 Sep 2015 19:48:23 +0000 (21:48 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 27 Sep 2015 19:48:23 +0000 (21:48 +0200)

Trivial merge