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

[Takao Fujiwara]

commit 4572476af2e0ea16e3d6be2f1ce7416c216dffd5
Merge: 98ef928 c019d13
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Tue Oct 28 15:51:24 2014 +0900

    Merge branch 'f21' into f20

 ibus-HEAD.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 ibus.spec       |    5 ++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---