[kipi-plugins/f13/master: 10/10] Merge remote branch 'origin/f14/master' into f13/master

[Lukas Tinkl]

commit 82c757fec8f842cc7f8e7ca8cd353d5abb3811c1
Merge: 2cca9b9 e9274ca
Author: Lukas Tinkl <lukas at kde.org>
Date:   Tue Jan 11 16:34:52 2011 +0100

    Merge remote branch 'origin/f14/master' into f13/master

 .gitignore        |    1 +
 kipi-plugins.spec |    8 ++++++--
 sources           |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---