[Pkg-owncloud-commits] [owncloud] 49/239: Merge pull request #5773 from owncloud/fix-2152-master

[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 4a2f9636cf567142f277b2691eb7c5df852313de
Merge: 5d9731c cd1cf58
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Nov 21 08:03:21 2013 -0800

    Merge pull request #5773 from owncloud/fix-2152-master
    
    Make working en_US.UTF-8 locale a hard requirement

 lib/base.php                 |  8 +-------
 lib/private/util.php         | 11 +++++++++--
 settings/admin.php           |  2 +-
 settings/templates/admin.php | 14 +++++++++++---
 4 files changed, 22 insertions(+), 13 deletions(-)


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