[Pkg-owncloud-commits] [owncloud] 53/104: Merge pull request #6679 from owncloud/backport-6675-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 627612c9e01fb265c322f8ee71bea35ed493ad78
Merge: 8d38228 c6fa2dd
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Jan 8 04:33:40 2014 -0800

    Merge pull request #6679 from owncloud/backport-6675-stable6
    
    Backport 6675 stable6

 .htaccess             | 3 +++
 lib/private/setup.php | 3 +++
 2 files changed, 6 insertions(+)

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