From kde-commits  Tue Jul 31 22:21:38 2012
From: Paul Mendez <paulestebanms () gmail ! com>
Date: Tue, 31 Jul 2012 22:21:38 +0000
To: kde-commits
Subject: [calligra/stage-paulm-test3] /: Merge branch 'master' into stage-paulm-test3
Message-Id: <20120731222138.01781A6094 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=134377357405109

Git commit 1906968ec0c54084211b915ba388213ee214c1b7 by Paul Mendez.
Committed on 31/07/2012 at 23:57.
Pushed by mendez into branch 'stage-paulm-test3'.

Merge branch 'master' into stage-paulm-test3

M  +3    -0    CMakeLists.txt

http://commits.kde.org/calligra/1906968ec0c54084211b915ba388213ee214c1b7