[libass/f13/master: 2/2] Merge branch 'f12/master' into f13/master

[Martin Sourada]

commit 418dab246a15a2340c2774d9e906f2b64781a250
Merge: ac6b8cd 3b0d3dd
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Mon Sep 13 12:47:08 2010 +0200

    Merge branch 'f12/master' into f13/master

 .gitignore  |    1 +
 libass.spec |   13 ++++++++++++-
 sources     |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
---