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

[Liang Suilong]

commit 43fa508fb4d568c2780683ff19ae00b8f07c8e0f
Merge: e477c33 7410e5a
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Sat Feb 4 13:46:22 2012 +0800

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

 fcitx.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc fcitx.spec
index bce5ea4,ce1acfe..3ec11d9
--- a/fcitx.spec
+++ b/fcitx.spec
@@@ -261,9 -260,9 +261,12 @@@ update-desktop-database %{_datadir}/app
  
  
  %changelog
 +* Sat Feb 04 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.0-1
 +- Upgrade to fcitx-4.2.0
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.2-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun Dec 25 2011 Liang Suilong <liangsuilong at gmail.com> - 4.1.2-3
  - Fix the spec