[Pkg-owncloud-commits] [owncloud] 88/129: Merge pull request #20036 from owncloud/stable8.2-backport-19957

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 7d2bb6c0288ca3e0fbb0f021f48c758f383249c0
Merge: 0aca631 dbec295
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Oct 26 10:59:22 2015 +0100

    Merge pull request #20036 from owncloud/stable8.2-backport-19957
    
    Stable8.2 backport 19957

 config/config.sample.php   | 8 ++++++++
 lib/private/log/syslog.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git