[SCM] gmerlin-avdecoder/master: Merge tag 'upstream/1.2.0_dfsg'

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

Imported Upstream version 1.2.0~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d73a2f4c904714aa745c6d1d9ff0f84b2e01f327
X-Git-Newrev: b4dd21a644eae05eb4066c21f9cb0eec6c313ce1

The following commit has been merged in the master branch:
commit 53149331012d8712c15389c80705b04ee1709084
Merge: d73a2f4c904714aa745c6d1d9ff0f84b2e01f327 b1a964e4276a5b3cb2aa9682c7a79c26a6748c08
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jun 11 13:31:28 2012 +0200

    Merge tag 'upstream/1.2.0_dfsg'
    
    Upstream version 1.2.0~dfsg
    # gpg: Unterschrift vom Mon 11 Jun 2012 13:31:25 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>"


-- 
gmerlin-avdecoder packaging