[fcitx: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/fcitx

[Liang Suilong]

commit b38c4bf0c9385c794f9f09f96a0481545113df8a
Merge: 82f1168 d1b3753
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Sun Jul 22 15:48:58 2012 +0800

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/fcitx
    
    Conflicts:
    	fcitx.spec

 fcitx.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc fcitx.spec
index 8636b25,ceb2a26..3882aba
--- a/fcitx.spec
+++ b/fcitx.spec
@@@ -308,8 -307,8 +308,10 @@@ update-desktop-database %{_datadir}/app
  
  
  %changelog
 +* Sun Jul 22 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.5-1
 +- Upstream to fcitx-4.2.5
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
  
  * Thu Jun 07 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.4-2
  - Drop fcitx-keyboard