[SCM] gavl/master: Merge tag 'upstream/1.4.0'

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

Imported Upstream version 1.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 73fcd0369afdae9a9e39871b727176b4e13ce3eb
X-Git-Newrev: dfcf9df46cb8c0d0889924ed69a5fff4184182c5

The following commit has been merged in the master branch:
commit e17b05f4f0a1c3ac6f2034e5ac577bb25f559bf7
Merge: 692037ad413e56e2ff0cf10ad2200baf1d153241 22eed8017b8d63647855c6088829d7f4f92f800c
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jun 11 09:34:31 2012 +0200

    Merge tag 'upstream/1.4.0'
    
    Upstream version 1.4.0
    # gpg: Unterschrift vom Mon 11 Jun 2012 09:34:28 CEST mittels DSA-Schlüssel ID FEB276F4
    # gpg: Korrekte Unterschrift von "forum::für::umläute <zmoelnig at umlaeute.mur.at>"
    # gpg:                     alias "IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>"
    # gpg:                     alias "IOhannes m zmölnig <zmoelnig at umlaeute.mur.at>"


-- 
gavl packaging