[libass/f14: 4/4] Merge branch 'f15' into f14

[Martin Sourada]

commit 66fe3305c8e377f944cfbdd0f0519639a1fd78e9
Merge: bfd4c56 e03aa5b
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Mon Jun 6 20:37:15 2011 +0200

    Merge branch 'f15' into f14
    
    Conflicts:
    	libass.spec

 .gitignore  |    1 +
 libass.spec |   15 +++++++++++----
 sources     |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --cc libass.spec
index 85e5f7f,800e5fc..81f45fe
--- a/libass.spec
+++ b/libass.spec
@@@ -64,7 -64,17 +64,14 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/pkgconfig/libass.pc
  
  %changelog
+ * Tue May 31 2011 Martin Sourada <mso at fedoraproject.org> - 0.9.12-1
+ - New upstrea release
+   - Licence changed to ISC
+   - Fixed word-wrapping
+   - Improved charmap fallback matching
+   - Various other improvements and fixes
+ 
 -* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.11-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Wed Sep 29 2010 jkeating - 0.9.11-2
 +* Wed Sep 29 2010 jkeating - 0.9.11-1.1
  - Rebuilt for gcc bug 634757
  
  * Mon Sep 13 2010 Martin Sourada <mso at fedoraproject.org> - 0.9.11-1