commit 2c0f16e590230b608579c6d57a3ef714c91be546 Merge: ad64f2e fc7438f Author: Daiki Ueno <ueno at unixuser.org> Date: Thu Aug 2 18:14:02 2012 +0900 Merge branch 'master' into f17 ibus-m17n-fix-mtext-config.patch | 25 +++++++++++++++++++++++++ ibus-m17n.spec | 12 +++++++++++- 2 files changed, 36 insertions(+), 1 deletions(-) ---