]> Git trees. - libqmvoc.git/commitdiff
more merging
authorFrederik Gladhorn <gladhorn@kde.org>
Wed, 4 Jun 2008 11:38:51 +0000 (11:38 +0000)
committerFrederik Gladhorn <gladhorn@kde.org>
Wed, 4 Jun 2008 11:38:51 +0000 (11:38 +0000)
svn path=/branches/work/soc-parley/libkdeedu/; revision=816628


Trivial merge