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

[Ding-Yi Chen]

commit 428954db074ca05b26535e09fc91550a40d10ba9
Merge: f90f368 fd56456
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Nov 26 18:43:39 2012 +1000

    Merge branch 'master' into el6

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