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

[Takao Fujiwara]

commit 98df8b96e0d438bedb04949f0214cfad3a80fe3e
Merge: f2e01ac 7db7c93
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Wed Feb 25 18:19:32 2015 +0900

    Merge branch 'f21' into f20

 .gitignore | 3 ++-
 sources    | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)
---