[tulrich-tuffy-fonts: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/tulrich-tuffy-fonts

[Toshio くらとみ]

commit 40b9f34589e54157958e53f07344cbbda3bd14a0
Merge: f9b3567 a38da78
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Jul 20 10:01:03 2012 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/tulrich-tuffy-fonts
    
    Conflicts:
    	tulrich-tuffy-fonts.spec

 tulrich-tuffy-fonts.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc tulrich-tuffy-fonts.spec
index 671315f,036bac4..e7f0902
--- a/tulrich-tuffy-fonts.spec
+++ b/tulrich-tuffy-fonts.spec
@@@ -2,8 -2,8 +2,10 @@@
  %global fontconf 60-%{fontname}.conf
  
  Name:           %{fontname}-fonts
 +Version:        1.28
 +Release:        1%{?dist}
+ Version:        1.27
+ Release:        2%{?dist}
  Summary:        Generic sans font
  
  Group:          User Interface/X
@@@ -67,9 -67,9 +69,12 @@@ rm -fr %{buildroot
  
  
  %changelog
 +* Fri Jul 20 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 1.28-1
 +- Minor upstream release fixing some metadata and accents
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Tue Aug 23 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 1.27-1
  - new upstream release with greek, cyrillic, and currency symbols added