[SCM] frei0r/master: Merge tag 'upstream/1.4'

[umlaeute at users.alioth.debian.org]

Imported Upstream version 1.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: 4a5b5d1062d37a6d9222e7db10db55f02ede945a
X-Git-Newrev: d9318cba4f1ab16cf41a02c4e7c85b24e650e1c5

The following commit has been merged in the master branch:
commit dde974a03e90fda28c65d78b2f5137d1125be3a9
Merge: d0db21089444344892c9615b1880d205f6b0fa0f 1d914e79d23b802fffe26d0f85bdd0e848040db9
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue May 20 14:02:49 2014 +0200

    Merge tag 'upstream/1.4'
    
    Upstream version 1.4
    
    # gpg: Signature made Tue 20 May 2014 02:02:45 PM CEST using RSA key ID 7F7A36F8
    # gpg: Good signature from "IOhannes m zmölnig <zmoelnig at umlaeute.mur.at>"
    # gpg:                 aka "IOhannes m zmölnig <zmoelnig at iem.at>"
    # gpg:                 aka "[jpeg image of size 5377]"
    # gpg:                 aka "IOhannes m zmölnig (IEM - Network Operation Center) <noc at iem.at>"
    # gpg:                 aka "IOhannes m zmölnig (mur.at - Verein zur Förderung von Netzwerkkunst) <zmoelnig at mur.at>"
    # gpg:                 aka "IOhannes m zmölnig (forum::für::umläute - Network Operation Center) <noc at umlaeute.mur.at>"
    # gpg:                 aka "Johannes Zmölnig (University of Music and Performing Arts - Graz) <johannes.zmoelnig at kug.ac.at>"
    # gpg:                 aka "IOhannes m zmölnig (forum::für::umläute) <forum at umlaeute.mur.at>"
    # gpg:                 aka "IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>"


-- 
frei0r packaging