[Pkg-owncloud-commits] [owncloud] 09/11: Merge pull request #1651 from owncloud/backports

[David Prévot]

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

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

commit 5b4c48d382d5d585a79cf000854be08ce58785a1
Merge: 3ad6ea0 b966095
Author: Lukas Reschke <lukas at statuscode.ch>
Date:   Tue Feb 12 08:19:58 2013 -0800

    Merge pull request #1651 from owncloud/backports
    
    Backports

 apps/admin_migrate/settings.php                   |    3 +++
 apps/admin_migrate/templates/settings.php         |    1 +
 apps/calendar/ajax/settings/settimezone.php       |    1 +
 apps/calendar/ajax/settings/timezonedetection.php |    2 ++
 apps/external/templates/settings.php              |    4 ++--
 apps/user_ldap/settings.php                       |    2 ++
 apps/user_ldap/templates/settings.php             |    1 +
 apps/user_migrate/ajax/export.php                 |    1 +
 apps/user_migrate/js/export.js                    |    2 +-
 apps/user_migrate/settings.php                    |    1 +
 apps/user_migrate/templates/settings.php          |    1 +
 11 files changed, 16 insertions(+), 3 deletions(-)

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