After discussion with Steve Langasek on IRC, the Debian changes are not sensibly different enough to need merging (not a real upstream version change).
After discussion with Steve Langasek on IRC, the Debian changes are not sensibly different enough to need merging (not a real upstream version change).