lenky0401/fcitx-qimpanel — pull request #18 by kroody (2013-12-16 08:52:24+00:00)
Title: Master

fix conficts