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

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

Imported Upstream version 1.2.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: 270ed9ef283afc25ba144fc7ff8f2558cdc0486c
X-Git-Newrev: cdc83d76271ec0157dbab9d80cc03c27de98e0a6

The following commit has been merged in the master branch:
commit 02f7fd26c775157295b271263f84c3972d5421d8
Merge: 270ed9ef283afc25ba144fc7ff8f2558cdc0486c a5529601424a0060010999bdf9b8e8b354149a5f
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jun 11 15:51:44 2012 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0
    # gpg: Unterschrift vom Mon 11 Jun 2012 15:51:42 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-encoders packaging