[ibus/f20] (4 commits) ...Merge branch 'master' into f20

[Takao Fujiwara]

Summary of changes:

  0bbc0be... Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3 (*)
  9cf84a5... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  6f58b8f... Updated ibus-HEAD.patch from upstream. (*)
  0029db0... Merge branch 'master' into f20

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