Merge proposals dependent on lp://qastaging/~dobey/intltool/localedir-fix

lp://qastaging/~dobey/intltool/localedir-fix has no merge proposals.