Marco Martin 46ba74adb1 Merge branch 'KDE/4.8'
Conflicts:
	kurifilter-plugins/ikws/searchproviders/cpan.desktop
2012-01-26 22:06:22 +01:00
..
2012-01-26 22:06:22 +01:00
2011-10-27 22:52:16 +02:00
2011-10-27 22:52:16 +02:00
2012-01-09 12:41:21 +01:00
2011-12-30 16:38:18 +01:00
2011-10-27 22:33:51 +02:00
2011-10-27 22:33:51 +02:00