[Pkg-owncloud-commits] [owncloud] 02/04: Merge tag 'upstream/5.0.12+dfsg'

[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 13f04d3112dd6ba04eb27b39a63d896003a824fb
Merge: eb42e4b bba9742
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 3 14:44:19 2013 -0400

    Merge tag 'upstream/5.0.12+dfsg'
    
    Upstream version 5.0.12+dfsg
    
    # gpg: Signature faite le jeu. 03 oct. 2013 14:36:20 AST avec la clef RSA d'identifiant 44F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 COPYING-README                                     |   15 -----
 apps/files_encryption/appinfo/info.xml             |    1 +
 core/doc/user/_sources/pim/index.txt               |    1 +
 core/doc/user/_sources/pim/sync_ios.txt            |    4 +-
 core/doc/user/_sources/pim/sync_osx.txt            |    4 +-
 core/doc/user/_sources/pim/troubleshooting.txt     |   36 +++++++++++
 core/doc/user/bookmarks.html                       |    2 +-
 core/doc/user/contents.html                        |    4 ++
 core/doc/user/pim/calendar.html                    |    1 +
 core/doc/user/pim/contacts.html                    |    1 +
 core/doc/user/pim/index.html                       |    2 +
 core/doc/user/pim/sync_ios.html                    |    5 +-
 core/doc/user/pim/sync_kde.html                    |    3 +-
 core/doc/user/pim/sync_osx.html                    |    2 +
 core/doc/user/pim/sync_thunderbird.html            |    1 +
 .../pim/{sync_kde.html => troubleshooting.html}    |   64 +++++++++++---------
 core/doc/user/searchindex.js                       |    2 +-
 core/templates/login.php                           |    2 +
 lib/base.php                                       |    1 +
 lib/util.php                                       |   54 ++++++++++++++---
 20 files changed, 145 insertions(+), 60 deletions(-)

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