commit a7e47d950d9f58efdb9cf555fef8ce63dfff1496 Merge: c404ec6 e03078b Author: Fedora <fedora at fedora-desktop.(none)> Date: Mon May 7 22:59:18 2012 +0800 Merge branch 'master' into f16 .gitignore | 1 + fcitx.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) ---