[Pkg-owncloud-commits] [owncloud] 58/104: Merge pull request #6696 from owncloud/backport-6693-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 52dc90d5fd99063dc67fe0e44208617e73cb05a0
Merge: 627612c 9a1cbab
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Jan 9 04:56:26 2014 -0800

    Merge pull request #6696 from owncloud/backport-6693-stable6
    
    Backport 6693 stable6

 lib/base.php                 |  4 ++--
 lib/private/user.php         |  2 ++
 lib/private/user/session.php | 14 +++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

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