Bug 1109580 - Fix intermitent icc unit tests

Bug 1145031 - fix duplicated option in select option of server certif…

…icate, r=ej

Merge pull request mozilla-b2g#29896 from millermedeiros/1037351-2.1S

Bug 1037351 - [Calendar] Double clicking to add an event in month view r=gaye

Merge pull request mozilla-b2g#29321 from RudyLu/keyboard/Bug1132778-…

…Fulah_dictionary_v2.0

Bug 1132778 - merge pull request mozilla-b2g#28588 from

Bug 1140154 - [Music] Adjust list-playlist-title selector in disabled…

… test r=hotfix a=testonly

Merge pull request mozilla-b2g#29113 from Delphine/bug-1143248-add-tl…

…-locale-to-2.1

Bug 1143248 - Add Tagalog (tl) locale to FxOS builds. r=stas

Merge branch 'v2.1' into v2.1s

Merge pull request mozilla-b2g#28370 from KevinGrandon/bug_1134250_1_…

…4_eme_endpoint

Bug 1134250 - Update appsearch endpoint

Merge pull request mozilla-b2g#28370 from KevinGrandon/bug_1134250_1_…

…4_eme_endpoint

Bug 1134250 - Update appsearch endpoint

Merge pull request mozilla-b2g#28734 from mpizza/bug_1118676_v2.0

Bug 1118676 - add SUB_COMPONENTS 'contextmenu' into search_window.js. r=alive.