From kde-commits  Thu Jan 31 22:14:07 2013
From: Montel Laurent <montel () kde ! org>
Date: Thu, 31 Jan 2013 22:14:07 +0000
To: kde-commits
Subject: [kdepimlibs/akregator_port] /: Merge remote-tracking branch 'origin/master' into akregator_port
Message-Id: <20130131221407.3D1C9A6091 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=135967045716414

Git commit c1b54d818d24b0490331307b0c07fff0497b1318 by Montel Laurent.
Committed on 31/01/2013 at 23:13.
Pushed by mlaurent into branch 'akregator_port'.

Merge remote-tracking branch 'origin/master' into akregator_port

M  +1    -1    CMakeLists.txt

http://commits.kde.org/kdepimlibs/c1b54d818d24b0490331307b0c07fff0497b1318