[Pkg-owncloud-commits] [owncloud] 53/134: Merge pull request #7690 from owncloud/backport-7683-stable6

[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 53ad7ebfea7ca7d6d34724f2eaebd59fe4e721d8
Merge: bff2c20 46657ad
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Mar 13 11:41:46 2014 +0100

    Merge pull request #7690 from owncloud/backport-7683-stable6
    
    Backport 7683 stable6

 lib/private/api.php | 33 ++++++++++++++++++++++++++++++---
 ocs/v1.php          |  2 ++
 2 files changed, 32 insertions(+), 3 deletions(-)

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