]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'master' into frameworks
authorLuca Beltrame <lbeltrame@kde.org>
Mon, 21 Jul 2014 19:20:05 +0000 (21:20 +0200)
committerLuca Beltrame <lbeltrame@kde.org>
Mon, 21 Jul 2014 19:20:05 +0000 (21:20 +0200)

Trivial merge