Bug 880919 - [WiFi] Use shared code for settings and FTU
Merge pull request #10273 from masap/20130608

Bug 880919 - [WiFi] Use shared code for settings and FTU (r=fcampo,arthurcc)
Bug 880628 - [MMS/SMS] Multi-recipient. Allow manual entry of duplicate recipients r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=880628
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Fix merge conflict from Bug 880628

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 881248 - [MMS] Multirecipient. A contact with >1 number must only render the relevant number (vs. rendering all)

https://bugzilla.mozilla.org/show_bug.cgi?id=881248
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 881248 - [MMS] Multirecipient. A contact with >1 number must only render the relevant number (vs. rendering all)

https://bugzilla.mozilla.org/show_bug.cgi?id=881248
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>