[Pkg-owncloud-commits] [owncloud] 54/66: Merge pull request #7362 from owncloud/fix-7259-5

[David Prévot]

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

taffit pushed a commit to annotated tag v5.0.15
in repository owncloud.

commit 195393e3241dd549676337d9ec02072373b99e50
Merge: b886545 e9671c9
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Mon Feb 24 11:23:20 2014 +0100

    Merge pull request #7362 from owncloud/fix-7259-5
    
    Backport #7259 to stable5

 config/config.sample.php |  3 +++
 lib/request.php          | 46 +++++++++++++++++++++++++++++++---------------
 lib/setup.php            |  1 +
 lib/updater.php          | 15 ++++++++++++++-
 4 files changed, 49 insertions(+), 16 deletions(-)

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