[Pkg-owncloud-commits] [owncloud] 34/85: Merge pull request #8847 from owncloud/stable6_backport_8557

[David Prévot]

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

taffit pushed a commit to branch 6.0
in repository owncloud.

commit d3445d9668461d0cfd2ce9873908f7e23c32ba72
Merge: e5dcec7 2910486
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Jun 4 10:26:59 2014 +0200

    Merge pull request #8847 from owncloud/stable6_backport_8557
    
    Stable6 backport of #8557

 lib/base.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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