From: Albert Astals Cid <aacid@kde.org>
Date: Mon, 17 Sep 2012 17:21:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/KDE/4.9'
X-Git-Tag: v4.9.80
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=ccb8cdcfc8cdede21563e7d831d75fcc05e9c8c2;p=libqmvoc.git

Merge remote-tracking branch 'origin/KDE/4.9'
---

a9212a2d4ff3d5f207e90df79d025e9226efd32c