[Pkg-owncloud-commits] [owncloud-client] 32/164: Merge branch 'master' 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 66fc8e9e27bf387316575eda05dfa3db9c8b0a72
Merge: 3259cf5 c6442f6
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Feb 19 11:32:16 2015 +0100

    Merge branch 'master' into 1.8

 binary                                             |  2 +-
 shell_integration/windows/OCOverlays/OCOverlay.cpp | 35 ++++++++++++----------
 shell_integration/windows/OCOverlays/OCOverlay.h   |  6 ----
 3 files changed, 21 insertions(+), 22 deletions(-)

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