[SCM] pd-zexy/master: Merge commit 'upstream/2.2.4'

[zmoelnig-guest at users.alioth.debian.org]

Imported Upstream version 2.2.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b15c35a053d28483df73d746ed308fef1b2bd457
X-Git-Newrev: 2e8126472f0eef6ecf43987679770bdb0b7ad93f

The following commit has been merged in the master branch:
commit 9e21f469d60199de20e31051c9ca80f1be92d8f3
Merge: d70cde16108121ab3112b0cc1024ce23cb9e7f39 4290febae494f8fbd6d899e14f6c6590207b4fdf
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Sep 27 15:52:43 2011 +0200

    Merge commit 'upstream/2.2.4'


-- 
pd-zexy packaging