From: Frederik Gladhorn <gladhorn@kde.org>
Date: Tue, 13 Apr 2010 15:27:28 +0000 (+0000)
Subject: merge changes from branch to trunk
X-Git-Tag: v4.4.80~7
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=2177eb9f7b7dcad1a0cb1d67070e21deab036ce9;p=libqmvoc.git

merge changes from branch to trunk

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=1114447
---

2177eb9f7b7dcad1a0cb1d67070e21deab036ce9