From kde-commits  Thu Oct 31 22:14:40 2013
From: Christian Mollekopf <chrigi_1 () fastmail ! fm>
Date: Thu, 31 Oct 2013 22:14:40 +0000
To: kde-commits
Subject: [kdepim-runtime] resources/kolabproxy: Merge branch '4.11'
Message-Id: <E1Vc0Vk-0000KW-5G () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=138325768807610

Git commit e5978f0d880dcbd4ab9d336d5dd53a5b3759e79f by Christian Mollekopf.
Committed on 31/10/2013 at 19:47.
Pushed by cmollekopf into branch 'master'.

Merge branch '4.11'

Conflicts:
	resources/kolabproxy/kolabdefs.cpp
	resources/kolabproxy/kolabdefs.h

M  +18   -6    resources/kolabproxy/kolabproxyresource.cpp

http://commits.kde.org/kdepim-runtime/e5978f0d880dcbd4ab9d336d5dd53a5b3759e=
79f