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

[Takao Fujiwara]

commit 98ef9286f7012cedb76d59acf6cd04f1f0790df8
Merge: 91ed552 76e7915
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Fri Oct 24 12:20:18 2014 +0900

    Merge branch 'f21' into f20

 ibus-xx-increase-timeout.patch |   88 ++++++++++++++++++++++++++++++++++++++++
 ibus.spec                      |    7 +++-
 2 files changed, 94 insertions(+), 1 deletions(-)
---