[Pkg-owncloud-commits] [owncloud] 136/172: Merge pull request #8587 from Raydiation/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 7abe3b1989c4645c1fc7604c562194308961fe40
Merge: 3daaf6b d8020c3
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu May 15 12:22:47 2014 +0200

    Merge pull request #8587 from Raydiation/master
    
    Small cleanup and language detection for apps

 lib/private/l10n.php                            | 17 +++++++++++++++++
 lib/private/server.php                          |  2 +-
 lib/public/appframework/db/mapper.php           |  6 +++---
 lib/public/il10n.php                            | 14 ++++++++++++++
 tests/lib/appframework/db/MapperTestUtility.php |  6 +++---
 5 files changed, 38 insertions(+), 7 deletions(-)

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