[Pkg-owncloud-commits] [owncloud] 42/134: Merge pull request #7672 from owncloud/backport-7659-stable6-2

[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 2e42b0555a3cd05a132e25d63282ba5443bf12ee
Merge: 37e1953 c1c6ce2
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Mar 11 16:26:28 2014 +0100

    Merge pull request #7672 from owncloud/backport-7659-stable6-2
    
    Backport 7659 stable6 2

 core/ajax/share.php  | 25 ++++++++++++++++++++-----
 lib/private/mail.php |  5 +----
 2 files changed, 21 insertions(+), 9 deletions(-)

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