From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 25 Nov 2015 14:24:20 +0000 (+0100)
Subject: Merge pull request #20705 from owncloud/fix_20648
X-Git-Tag: v9.0beta1~686
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=afe76840f8806e5fbbdf785cfa8b8857c57c702e;p=nextcloud-server.git

Merge pull request #20705 from owncloud/fix_20648

Fix overriding function from 3rdparty warning
---

afe76840f8806e5fbbdf785cfa8b8857c57c702e