[Pkg-owncloud-commits] [ocsync] 02/07: Merge tag 'upstream/0.90.2'

[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 4011d36cbc7c38419da002becfe4c78a1f2c31b7
Merge: ad5d967 b2fecc9
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Thu Sep 26 18:58:04 2013 +0200

    Merge tag 'upstream/0.90.2'
    
    Upstream version 0.90.2

 .tag                                    |    2 +-
 AUTHORS                                 |    1 +
 CMakeLists.txt                          |    2 +-
 ChangeLog                               |   12 +-
 doc/ocsync.1                            |  221 ++++++-------------------------
 doc/ocsync.1.txt                        |   22 +--
 doc/ocsync.txt                          |    2 +-
 doc/userguide/csync.html                |    2 +-
 modules/csync_owncloud.c                |   70 ++++++----
 src/CMakeLists.txt                      |    2 +-
 src/csync_exclude.c                     |  108 ++++++++++++---
 src/csync_exclude.h                     |    2 +-
 src/csync_misc.c                        |    1 +
 src/csync_misc.h                        |   11 ++
 src/csync_propagate.c                   |    2 +-
 src/csync_propagate.h                   |    2 +-
 src/csync_update.c                      |   33 ++---
 src/csync_util.c                        |    9 +-
 src/httpbf/src/httpbf.c                 |   22 ++-
 src/httpbf/src/httpbf.h                 |    1 +
 tests/csync_tests/check_csync_exclude.c |   64 +++++++--
 21 files changed, 317 insertions(+), 274 deletions(-)

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