pidgin/quail/quail-redux

pidgin/quail/quail-redux/
Merge heads

2013-09-18, Phil Hannent
e5d44cb3bb4f