[Pkg-owncloud-commits] [owncloud-client] 70/159: Merge remote-tracking branch into 1.8

[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 50ba73860cf382a4d74732bc7556022d2269331b
Merge: f4e2c84 750cdc1
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Apr 7 08:02:55 2015 +0200

    Merge remote-tracking branch into 1.8

 src/cmd/simplesslerrorhandler.cpp | 3 ++-
 src/cmd/simplesslerrorhandler.h   | 2 +-
 src/gui/sslerrordialog.cpp        | 3 ++-
 src/gui/sslerrordialog.h          | 2 +-
 src/libsync/account.cpp           | 2 +-
 src/libsync/account.h             | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)


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