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

[Liang Suilong]

commit 9ec252a776ea14bb5cec6baa915a563ffc083c72
Merge: 3a4ae1e dbff704
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Wed Jul 25 00:39:41 2012 +0800

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

 fcitx-table-extra.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc fcitx-table-extra.spec
index 293d92b,89fd2f2..3d65578
--- a/fcitx-table-extra.spec
+++ b/fcitx-table-extra.spec
@@@ -63,9 -63,9 +63,13 @@@ f
  
  
  %changelog
++<<<<<<< HEAD
 +* Wed Jul 25 2012 Liang Suilong <liangsuilong at gmail.com> - 0.3.2-1
 +- Upstream to 0.3.2
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Mon May 07 2012 Liang Suilong <liangsuilong at gmail.com> - 0.3.0-1
  - Upstream to 0.3.0