From kde-commits  Fri Feb 28 21:52:08 2014
From: Montel Laurent <montel () kde ! org>
Date: Fri, 28 Feb 2014 21:52:08 +0000
To: kde-commits
Subject: [kdepim/akregator_port] /: Merge remote-tracking branch 'origin/master' into akregator_port
Message-Id: <E1WJVLk-0007ok-7D () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=139362433707032

Git commit 44532291fd9ff77385078a8bd8d552a502b82e95 by Montel Laurent.
Committed on 28/02/2014 at 21:51.
Pushed by mlaurent into branch 'akregator_port'.

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

M  +7    -7    CMakeLists.txt

http://commits.kde.org/kdepim/44532291fd9ff77385078a8bd8d552a502b82e95