commit 837d3493c9a7b8970ac8a0081625661483892b64
Merge: eec8d37 0631339
Author: Fedora <fedora at fedora-desktop.(none)>
Date: Mon Apr 23 21:58:46 2012 +0800
Merge branch 'master' into f16
.gitignore | 1 +
fcitx.spec | 15 +++++++++------
sources | 6 +-----
3 files changed, 11 insertions(+), 11 deletions(-)
---