pidgin/quail/quail-redux

pidgin/quail/quail-redux/
Fix merge

2013-09-21, Phil Hannent
4d501b99d544