[ibus-fbterm/f12/master: 2/2] Merge remote branch 'origin' into f12

[Ding-Yi Chen]

commit 312f3dab50fc62e380666ecbf7e9715bb760ff30
Merge: 057f237 83841fe
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Sep 20 21:08:12 2010 +1000

    Merge remote branch 'origin' into f12

 ibus-fbterm.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---