commit 6890ab90c7effe467c308995536d3fdc45415541
Merge: 0e75cad e03078b
Author: Fedora <fedora at fedora-desktop.(none)>
Date: Mon May 7 23:00:07 2012 +0800
Merge branch 'master' into f15
.gitignore | 1 +
fcitx.spec | 10 ++++++----
sources | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
---