pidgin/quail/quail-redux

pidgin/quail/quail-redux/
Fix merge conflict, part2

2013-09-20, Phil Hannent
a985a548a72f