mozilla-b2g/gaia — pull request #12522 by davidflanagan (2013-09-27 22:15:40+00:00)
Title: Bug 893358 - Italian keyboard layout support

fix merge conflicts