[ibus-table-chinese/el6: 2/2] Merge branch 'master' into el6

[Ding-Yi Chen]

commit a52da87f78f57d21b4526407e731a0885c5954c2
Merge: 9605fba 54783fd
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Nov 26 16:06:08 2012 +1000

    Merge branch 'master' into el6

 .gitignore              |    1 +
 ibus-table-chinese.spec |   14 ++++++++++++--
 sources                 |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---