[Pkg-owncloud-commits] [owncloud] 05/14: Merge pull request #9775 from owncloud/backport-9738-stable7

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 69065ceecbd384e30323d250a4eda8930671d81c
Merge: 508fd15 a393670
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Jul 22 17:24:33 2014 +0200

    Merge pull request #9775 from owncloud/backport-9738-stable7
    
    Backport 9738 stable7

 lib/base.php | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

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