From kde-commits  Mon Feb 28 22:39:39 2011
From: Volker Krause <vkrause () kde ! org>
Date: Mon, 28 Feb 2011 22:39:39 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bakonadi=5D_server=3A_Merge_branch_=271=2E5=27?=
Message-Id: <20110228223939.808EBA60CD () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129893281323692

Git commit 36dec34bc4413bc9d0a4eaf621481e519847eb14 by Volker Krause.
Committed on 28/02/2011 at 23:36.
Pushed by vkrause into branch 'master'.

Merge branch '1.5'

MM +1    -1    server/CMakeLists.txt     
I  +34   -18   server/src/nepomuk/dbusoperators.cpp     
I  +28   -13   server/src/nepomuk/dbusoperators.h     
I  +8    -0    server/src/nepomuk/nepomukquery_export.h     
I  +1    -4    server/src/nepomuk/org.kde.nepomuk.Query.xml     
I  +0    -30   server/src/nepomuk/querymetatype.h     

http://commits.kde.org/akonadi/36dec34bc4413bc9d0a4eaf621481e519847eb14