[ibus/f20: 2/2] Merge branch 'f21' into f20

[Takao Fujiwara]

commit 91ed552c3366a842e40b5b8f9fdb54e764708da4
Merge: 08ec854 3aca75d
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Wed Oct 1 17:27:22 2014 +0900

    Merge branch 'f21' into f20

 .gitignore      |    1 +
 ibus-HEAD.patch |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ibus.spec       |   10 ++++++++-
 sources         |    1 +
 4 files changed, 68 insertions(+), 1 deletions(-)
---