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