[fonts-tweak-tool: 2/2] Merge upstream

[jamesni]

commit dec946c87188c8e8a797ab8bd602957b1530e206
Merge: f0e1c44 db70531
Author: James Ni <kent.neo at gmail.com>
Date:   Tue Jul 24 22:57:28 2012 +0800

    Merge upstream

 fonts-tweak-tool.spec |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --cc fonts-tweak-tool.spec
index 18c192f,077c4d7..1b88c46
--- a/fonts-tweak-tool.spec
+++ b/fonts-tweak-tool.spec
@@@ -1,6 -1,6 +1,11 @@@
  Name: fonts-tweak-tool
++<<<<<<< HEAD
 +Version: 0.0.7
 +Release: 1%{?dist}
++=======
+ Version: 0.0.6
+ Release: 2%{?dist}
++>>>>>>> db70531c7023de4dd5002e9fe961f3b11de4467b
  Summary: Tool for customizing fonts per language
  
  Group: User Interface/Desktops
@@@ -42,12 -42,9 +47,15 @@@ desktop-file-install --dir=${RPM_BUILD_
  %{_datadir}/applications
  
  %changelog
 +* Tue Jul 24 2012 James Ni <kent.neo at gmail.com> - 0.0.7-1
 +- Fixed rhbz#838871, Apply button is always clickable
 +- Fixed rhbz#838854, existing settings in .i18n isn't reflected to initial value
 +- Fixed rhbz#838865, Unable to remove language in GTK Language Order tab
 +- Fixed rhbz#838850 - empty language added to .i18n
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.6-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Wed Jun 27 2012 James Ni <jni at redhat.com> - 0.0.6-1
  - Implement pango_language feature and bug fix