mozilla-b2g/gaia — pull request #25897 by gabrielesvelto (2014-11-06 19:59:34+00:00)
Title: Bug 1053641 - Remove newlines from localized strings describing call forwarding status r=drs

(cherry picked from commit c451052868e71c932311dae95d99857c5b368f49)

Conflicts:
apps/communications/dialer/locales/dialer.en-US.properties
apps/communications/dialer/test/unit/mmi_test.js