From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 27 Nov 2015 16:48:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/material_buttons' into beta
X-Git-Tag: beta-20151128~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/32dadbcc6ca0de9924f216f81c6a124862ab3136?ds=inline

Merge remote-tracking branch 'remotes/upstream/material_buttons' into beta
---

32dadbcc6ca0de9924f216f81c6a124862ab3136