[Pkg-owncloud-commits] [owncloud-client] 203/484: Merge branch '2.0.2' into 2.0

[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 ee653155208081a3d5faf9b688dfbbbcc93fdf40
Merge: 4d7fde5 726be08
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Oct 29 15:44:56 2015 +0100

    Merge branch '2.0.2' into 2.0
    
    Conflicts:
    	ChangeLog

 ChangeLog                  | 64 +++++++++++++++++++++++-----------------------
 VERSION.cmake              |  2 +-
 src/libsync/configfile.cpp |  6 +----
 3 files changed, 34 insertions(+), 38 deletions(-)

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