[Pkg-owncloud-commits] [ocsync] 02/04: Merge tag 'upstream/0.90.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 b7a3d640a65b9a2f84d70222072fafc382e9646d
Merge: 4053b03 4b09364
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Oct 21 20:31:20 2013 +0200

    Merge tag 'upstream/0.90.4'
    
    Upstream version 0.90.4

 .tag                     |    2 +-
 CMakeLists.txt           |    2 +-
 ChangeLog                |   11 +++++++++++
 modules/csync_owncloud.c |    4 ++--
 src/csync.c              |   17 +++--------------
 src/csync_propagate.c    |   10 ++++++----
 src/csync_update.c       |    2 +-
 src/httpbf/src/httpbf.c  |   10 ++++++----
 8 files changed, 31 insertions(+), 27 deletions(-)

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