[Pkg-owncloud-commits] [owncloud] 10/11: Merge tag 'upstream/7.0.9__rc1_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 1fcf59c88bcd0970c7c6fc6f312aec2861d37622
Merge: 43734ff 43e5520
Author: David Prévot <taffit at debian.org>
Date:   Sat Aug 29 18:18:42 2015 -0400

    Merge tag 'upstream/7.0.9__rc1_dfsg'
    
    Upstream version 7.0.9~~rc1~dfsg
    
    # gpg: Signature made sam. 29 août 2015 18:18:37 AST
    # gpg:                using RSA key 058C1CF944F6BD3C
    # gpg: Good signature from "David Prévot <david at tilapin.org>"
    # gpg:                 aka "David Prévot <davidp at altern.org>"
    # gpg:                 aka "David Prévot <davidp at no-log.org>"
    # gpg:                 aka "David Prévot <taffit at debian.org>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #      Subkey fingerprint: 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 apps/calendar/js/calendar.js                       |  4 +-
 apps/files_external/lib/config.php                 | 12 +++++
 .../configuration/logging_configuration.txt        | 48 ++++++++-----------
 .../configuration/logging_configuration.html       | 56 +++++++++-------------
 core/doc/user/_sources/pim/contacts.txt            |  4 +-
 core/doc/user/_sources/pim/sync_ios.txt            |  8 ++--
 core/doc/user/_sources/pim/sync_osx.txt            |  5 +-
 core/doc/user/pim/contacts.html                    |  3 +-
 core/doc/user/pim/sync_ios.html                    |  6 +--
 core/doc/user/pim/sync_osx.html                    |  3 +-
 lib/private/installer.php                          |  4 ++
 lib/private/updater.php                            |  8 ++++
 version.php                                        |  8 ++--
 13 files changed, 91 insertions(+), 78 deletions(-)

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