[SCM] zita-at1/master: Merge commit 'upstream/0.2.3'

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

Imported Upstream version 0.2.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: aa4695cd893f67dc737884c4f58231bb3d6d8b8b
X-Git-Newrev: 54e3e33a4bea46135a2ab762ee0efadc8f5722e0

The following commit has been merged in the master branch:
commit 23ec8cad06c88900fae36093741f1ad5d54366a4
Merge: aa4695cd893f67dc737884c4f58231bb3d6d8b8b 519c8d11caa8118aa406c9a33d7b812508e3f901
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Jun 28 23:55:29 2011 +0200

    Merge commit 'upstream/0.2.3'


-- 
zita-at1 packaging