[Pkg-owncloud-commits] [owncloud-client] 82/332: Merge remote-tracking branch 'origin/1.6'

[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 8da97a7c6f5570b5eca110d83259c2540b4a776e
Merge: c593256 e1db834
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Fri Jun 13 13:31:50 2014 +0200

    Merge remote-tracking branch 'origin/1.6'

 csync/config_csync.h.cmake                 |  2 +-
 src/mirall/accountsettings.cpp             |  2 --
 src/mirall/folderwizard.cpp                | 11 ++---------
 src/mirall/folderwizard.h                  |  5 +----
 src/wizard/owncloudshibbolethcredspage.cpp |  3 +--
 5 files changed, 5 insertions(+), 18 deletions(-)

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