pidgin/quail/quail-redux

pidgin/quail/quail-redux/
Fix merge conflict

2013-09-20, Phil Hannent
a355ffbd00cb