[Pkg-owncloud-commits] [ocsync] 25/29: Merge tag 'upstream/0.91.4'

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository ocsync.

commit bde440e41e6c22ab154d9cacbec5432df2a03b79
Merge: de36541 7cb88e9
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Dec 13 15:10:57 2013 +0100

    Merge tag 'upstream/0.91.4'
    
    Upstream version 0.91.4
    
    # gpg: Unterschrift vom Fr 13 Dez 2013 15:10:34 CET mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"

 .tag                                    |  2 +-
 CMakeLists.txt                          |  2 +-
 ChangeLog                               | 51 +++++++++++++++++++++++++++++++++
 src/csync_dbtree.c                      |  2 +-
 src/csync_misc.c                        | 11 ++-----
 src/csync_misc.h                        |  2 +-
 src/csync_owncloud.c                    | 12 ++++----
 src/csync_owncloud_recursive_propfind.c |  8 +-----
 src/csync_statedb.c                     |  9 +++---
 src/csync_statedb.h                     |  2 +-
 src/csync_update.c                      |  2 +-
 src/csync_update.h                      |  2 +-
 src/csync_util.c                        |  2 +-
 src/csync_util.h                        |  2 +-
 src/std/c_private.h                     |  9 ++++++
 src/std/c_string.c                      |  4 +--
 tests/ownCloud/ownCloud/Test.pm         | 20 ++++++-------
 17 files changed, 94 insertions(+), 48 deletions(-)

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