[Pkg-owncloud-commits] [owncloud-client] 156/333: Merge branch '1.5'

[Sandro Knauß]

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

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

commit bf5091d862749ff9978d38ab552e4f44ad99b08f
Merge: c74e755 5c45ede
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Mar 17 11:26:28 2014 +0100

    Merge branch '1.5'

 src/creds/httpcredentials.cpp      |  2 --
 src/mirall/folderwatcher_linux.cpp | 11 ++++-------
 src/mirall/networkjobs.cpp         |  6 ++++--
 src/mirall/quotainfo.cpp           |  5 +++--
 4 files changed, 11 insertions(+), 13 deletions(-)


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