From kde-commits  Thu Mar 31 21:25:11 2011
From: =?utf-8?q?Nicol=C3=A1s_Alvarez?= <nicolas.alvarez () gmail ! com>
Date: Thu, 31 Mar 2011 21:25:11 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bkde-ruleset/global-merges=5D_/=3A_Merge_branch_=27m?=
Message-Id: <20110331212511.17F52A60A9 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=130160674901744

Git commit 4eff0ed4c8be88d32773c4aff2c0465101e9fbbc by Nicolás Alvarez.
Committed on 31/03/2011 at 23:11.
Pushed by nalvarez into branch 'global-merges'.

Merge branch 'master' into global-merges

I  +2    -0    kdeedu/khangman-parentmap     
I  +1    -2    kdeedu/notes     
I  +24   -0    playground/kpicross-rules     

http://commits.kde.org/kde-ruleset/4eff0ed4c8be88d32773c4aff2c0465101e9fbbc