[fcitx/f15] (4 commits) ...Merge branch 'master' into f15

[Liang Suilong]

Summary of changes:

  7410e5a... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  e477c33... Bump into 4.2.0 (*)
  43fa508... Merge branch 'master' of ssh://pkgs.fedoraproject.org/fcitx (*)
  1adef82... Merge branch 'master' into f15

(*) This commit already existed in another branch; no separate mail sent