[ibus/f20: 4/4] Merge branch 'master' into f20

[Takao Fujiwara]

commit 0029db034cefd7f5c0e58d4394cfed9b1cb427b6
Merge: 7730e4f 6f58b8f
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Mon Jul 7 17:55:40 2014 +0900

    Merge branch 'master' into f20

 ibus-HEAD.patch | 1126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ibus.spec       |   18 +-
 2 files changed, 1143 insertions(+), 1 deletions(-)
---