[Pkg-owncloud-commits] [owncloud] 33/46: Merge pull request #11673 from owncloud/backport-11593

[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 d0b3fe2414a553f3b6b1d4bc8dbb937a732a18db
Merge: 86daab2 3e02e79
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Oct 20 20:09:27 2014 +0200

    Merge pull request #11673 from owncloud/backport-11593
    
    Backport #11593

 lib/private/request.php        |  2 +-
 lib/private/templatelayout.php | 30 +++++++++++++------
 tests/lib/templatelayout.php   | 68 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 10 deletions(-)

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