[Pkg-owncloud-commits] [owncloud] 310/394: Merge pull request #1323 from eMerzh/backport_1113

[David Prévot]

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

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 8939d41c6c58e3e508687ab0a90889d70eddd26d
Merge: 6c87a07 8c3519a
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Sat Jan 26 11:21:57 2013 -0800

    Merge pull request #1323 from eMerzh/backport_1113
    
    Backport of #1113, Fix rendering of database connection error page

 core/js/js.js                   |    2 +-
 core/templates/layout.base.php  |    1 -
 core/templates/layout.guest.php |    1 -
 lib/db.php                      |   17 ++++++++++++++---
 lib/setup.php                   |    2 ++
 lib/template.php                |    1 +
 lib/templatelayout.php          |   17 ++++++-----------
 7 files changed, 24 insertions(+), 17 deletions(-)

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