[libass/f14: 3/3] Merge branch 'master' into f14

[Martin Sourada]

commit a3aac1c7cb40602900089817a12cfb0b60caff35
Merge: 66fe330 2f8a8e8
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Fri Nov 11 23:44:14 2011 +0100

    Merge branch 'master' into f14

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