Merge branch 'master' of git.kde.org:kdevplatform
authorOlivier JG <olivier.jg@gmail.com>
Mon, 4 Jul 2011 05:35:42 +0000 (13:35 +0800)
committerOlivier JG <olivier.jg@gmail.com>
Mon, 4 Jul 2011 05:35:42 +0000 (13:35 +0800)
commit76b510f8c596f486346745115f21660dcef24303
tree15dea9f2f48bde541cb34a73e3cab081369cee2a
parent30fb0611a497ed69ff90c9bee9c84f281223817b
parent29336ee723dad53d8008850c912ed29e515231da
Merge branch 'master' of git.kde.org:kdevplatform