[SCM] libass/master: Merge tag 'upstream/0.12.1'

[sramacher at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 9430e526add666ba29fd7d8e967cb95da08ebc48
Merge: d9eae1f0aefacf9b8c838cb5108dcc100f336e0b 5d7718deef1f11958b1cd7eeb94e629d5ad11125
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Jan 9 18:23:44 2015 +0100

    Merge tag 'upstream/0.12.1'
    
    Upstream version 0.12.1


-- 
LibASS packaging