From: Luca Beltrame <luca.beltrame@marionegri.it>
Date: Fri, 21 Sep 2012 08:55:08 +0000 (+0200)
Subject: Merge branch 'KDE/4.9'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f1b822d926316d739ec10d8b05917b6b0c2d92b5

Merge branch 'KDE/4.9'

Conflicts:
	konq-plugins/dirfilter/dirfilterplugin.cpp
	konq-plugins/dirfilter/dirfilterplugin.h
---

f1b822d926316d739ec10d8b05917b6b0c2d92b5