Merge branch 'master' of git://github.com/phuang/ibus
authorJulien Humbert <julroy67@gmail.com>
Fri, 4 Jun 2010 09:26:07 +0000 (11:26 +0200)
committerJulien Humbert <julroy67@gmail.com>
Fri, 4 Jun 2010 09:26:07 +0000 (11:26 +0200)

Trivial merge