wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
242,211 Commits 1 Branch 166 Tags 1.2 GiB
b9872b41a7
Commit Graph

22728 Commits

Author SHA1 Message Date
B2G Bumper Bot
2623ff61c8 Bumping manifests a=b2g-bump 2015-05-03 23:27:44 -07:00
B2G Bumper Bot
6599483855 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/c9b2cd813207
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #29847 from crh0716/1155600

Bug 1155600 - add missing happy field & fix test r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/82ad3300eb2c
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1155600 - add missing happy field & fix test
 2015-05-03 23:25:10 -07:00
B2G Bumper Bot
8aedcbeaf7 Bumping manifests a=b2g-bump 2015-05-03 22:54:56 -07:00
B2G Bumper Bot
a779af3b9e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/899731fed2d9
Author: Yi-Fan Liao <yliao@mozilla.com>
Desc: Merge pull request #29845 from begeeben/1117699_allow_user_to_move

Bug 1117699 - [Stingray][Home] Allow user to move cards into folder, r=rexboy

========

https://hg.mozilla.org/integration/gaia-central/rev/d157db51367d
Author: Yi-Fan Liao <begeeben@gmail.com>
Desc: Bug 1117699 - [Stingray][Home] Allow user to move cards into folder

* Rename swap card queue to move queue.
* Fix delete card and add new folder bug caused by _concealPanel causing cardScrollable focus null.
* Add hover over folder functionality.
* Finish folder viewer layout and hover animations in edit mode.
* Implement add to folder functionality.
* Implement card swapping in folder list.
 2015-05-03 22:52:43 -07:00
B2G Bumper Bot
c3b2e4df17 Bumping manifests a=b2g-bump 2015-05-03 21:16:01 -07:00
B2G Bumper Bot
48ca79820a Bumping gaia.json for 10 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/79a64c834cb8
Author: Sean Lee <weilonge@gmail.com>
Desc: Merge pull request #29538 from mancas/bug1154439

Bug 1154439 - [STK] TypeError: options.confirmMessage is undefined at: a... r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/f19c42cdd638
Author: Manuel <manuel.casasbarrado@gmail.com>
Desc: Bug 1154439 - [STK] TypeError: options.confirmMessage is undefined at: app://system.gaiamobile.org/gaia_build_defer_index.js. r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/8d43dbbd4700
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #29739 from huchengtw-moz/bug-1154642-v2

Bug 1154642 - [System] focus to corrent element and wait for transitione..., r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/ff3e6f1a31a5
Author: John Hu <johu@mozilla.com>
Desc: Bug 1154642 - [System] focus to corrent element and wait for transitionend before changing focus

========

https://hg.mozilla.org/integration/gaia-central/rev/5252cfb8ad11
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #29808 from KevinGrandon/reland_bug_1158238

Bug 1158238 - [System] Add import activity

========

https://hg.mozilla.org/integration/gaia-central/rev/ca25cd26e433
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1158238 - [System] Add import activity r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/3ce6309cec25
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1160797 - merge pull request #29842 from KevinGrandon:bug_1160797_lockscreen_slide_jshint_fixes to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/fa65fb3353f6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1160797 - Jshint fixes for lockscreen_slide.js r=gweng

========

https://hg.mozilla.org/integration/gaia-central/rev/db8c1232eff6
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1158757 - merge pull request #29758 from crh0716:1158757 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/404c8ded7f2f
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1158757 - Define ObservableArray using Observable and EventEmitter
 2015-05-03 21:13:45 -07:00
B2G Bumper Bot
918d8bde2d Bumping manifests a=b2g-bump 2015-05-03 19:47:32 -07:00
B2G Bumper Bot
1a69bf374f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/7799ac5a8c2e
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1150495 - merge pull request #29342 from KevinGrandon:bug_1150495_cached_icon_overwrite to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/805dc9a3e1b0
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1150495 - [GaiaGrid] Do not overwrite icons when we have a cached icon
 2015-05-03 19:45:19 -07:00
B2G Bumper Bot
36b23716b7 Bumping manifests a=b2g-bump 2015-05-03 15:54:48 -07:00
B2G Bumper Bot
c48969c290 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/5e3e119720a3
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #29832 from mcav/reportError-master

Bug 1145473 - [email/backend] MailAPI's bridge-processing logic may brea...

========

https://hg.mozilla.org/integration/gaia-central/rev/39cf5143b481
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 1145473 - [email/backend] MailAPI's bridge-processing logic may break. r=asuth
 2015-05-03 15:52:35 -07:00
B2G Bumper Bot
46024f2589 Bumping manifests a=b2g-bump 2015-05-02 11:32:28 -07:00
B2G Bumper Bot
1a210125cc Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/2312b269a3d6
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1160096 - merge pull request #29838 from sfoster:confirm-btn-padding-bug-1160096 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/072837ea6cdb
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1160096 - Fix confirm button padding
 2015-05-02 11:30:07 -07:00
B2G Bumper Bot
804fcf481e Bumping manifests a=b2g-bump 2015-05-01 21:52:23 -07:00
B2G Bumper Bot
fb46c879e0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f5038dcd6b18
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #29789 from chenpighead/bug1159601

Bug 1159601 - Avoid two successive calls of longpress in gaia integration test

========

https://hg.mozilla.org/integration/gaia-central/rev/ec6eb9b98e14
Author: Jeremy Chen <jichen@mozilla.com>
Desc: Bug 1159601 - Avoid two successive calls of longpress in text_selection_test.js. r=gduan
 2015-05-01 21:50:10 -07:00
B2G Bumper Bot
a646c7fc0c Bumping manifests a=b2g-bump 2015-05-01 18:37:33 -07:00
B2G Bumper Bot
488bcaa39f Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/6eeae9380894
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1159644 - merge pull request #29837 from sfoster:editmode-button-padding-bug-1159644 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/1aa590b50afb
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1159644 - Reduce padding on buttons to account for fixed overflow/truncation behavior

========

https://hg.mozilla.org/integration/gaia-central/rev/5bcbb5389be6
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1158740 - merge pull request #29805 from sfoster:shared-button-padding-bug-1158740 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/07c813572840
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1158740 - reduce padding in dialog buttons
 2015-05-01 18:35:19 -07:00
B2G Bumper Bot
28e611e2d9 Bumping manifests a=b2g-bump 2015-05-01 16:22:40 -07:00
B2G Bumper Bot
70af11e4f1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/e4c21da65950
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1160661 - merge pull request #29836 from jrburke:bug1160661-email-gaia-theme-css to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/264ee56ff057
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1160661 - [email] use gaia-theme.css to get transition-duration CSS variable
 2015-05-01 16:20:23 -07:00
B2G Bumper Bot
825f577612 Bumping manifests a=b2g-bump 2015-05-01 15:32:34 -07:00
B2G Bumper Bot
9d96f2d2b9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/128e01b4dd0b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #29833 from npark-mozilla/1160624

Bug 1160624 - xfail test_music_songs_3gp.py

========

https://hg.mozilla.org/integration/gaia-central/rev/c6de9df7da2d
Author: No-Jun Park <npark@mozilla.com>
Desc: Bug 1160624 - xfail test_music_songs_3gp.py
 2015-05-01 15:30:22 -07:00
B2G Bumper Bot
422bb01f86 Bumping manifests a=b2g-bump 2015-05-01 15:02:22 -07:00
B2G Bumper Bot
0ef0c8d18e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/4ab6fd35eb56
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1084242 - merge pull request #29829 from KevinGrandon:bug_1084242_jshint_shared_fb to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/5c35e5443551
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1084242 - Fix jshint problems for shared/js/fb/
 2015-05-01 15:00:10 -07:00
B2G Bumper Bot
e25cbd3448 Bumping manifests a=b2g-bump 2015-05-01 13:54:55 -07:00
B2G Bumper Bot
9f1d3d5e1a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/165592a10ca1
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1158447 - merge pull request #29830 from asutherland:email-dot-stuffing to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/e4e808deb672
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1158447 - fix SMTP dot stuffing. r=mcav

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/380
 2015-05-01 13:52:42 -07:00
B2G Bumper Bot
ad184f3c1d Bumping manifests a=b2g-bump 2015-05-01 10:52:21 -07:00
B2G Bumper Bot
467a6095ba Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/99b2099a5fa6
Author: Dietrich Ayala <autonome@gmail.com>
Desc: Merge pull request #29562 from autonome/1143226-animations

Bug 1143226 - animations throughout Gaia combine for a generally sluggis...

========

https://hg.mozilla.org/integration/gaia-central/rev/8cb3fac967f4
Author: autonome <autonome@gmail.com>
Desc: Bug 1143226 - animations throughout Gaia combine for a generally sluggish user experience (r=gaia team)
 2015-05-01 10:50:09 -07:00
B2G Bumper Bot
87e48d79dd Bumping manifests a=b2g-bump 2015-05-01 10:32:49 -07:00
B2G Bumper Bot
9f629bcb17 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/e61f310e1e76
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #29811 from sean2449/Bug_1159137-XSS-value-picker

Bug 1159137 - [Stingray][Smart-System] Replace innerHTML with textConten...

========

https://hg.mozilla.org/integration/gaia-central/rev/0fa090e7725f
Author: Sung Chiu <suchiu@mozilla.com>
Desc: Bug 1159137 - [Stingray][Smart-System] Replace innerHTML with textContent in ValuePicker to prevent XSS injection

========

https://hg.mozilla.org/integration/gaia-central/rev/8126e24cfbca
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #29786 from sean2449/Bug-1159136-XSS-app-modal-dialog

Bug 1159136 - [Stingray][Smart-System] Replace innerHTML with textConten...

========

https://hg.mozilla.org/integration/gaia-central/rev/7ab95a5cf135
Author: Sung Chiu <suchiu@mozilla.com>
Desc: Bug 1159136 - [Stingray][Smart-System] Replace innerHTML with textContent in app_modal_dialog

========

https://hg.mozilla.org/integration/gaia-central/rev/98900a2d70a3
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #29767 from sean2449/Bug-1158715-XSS

Bug 1158715 - Replace HTML string with Tagged.escapeHTML for selectOneMenu in modal dialog

========

https://hg.mozilla.org/integration/gaia-central/rev/3e612079c3fb
Author: Sung Chiu <suchiu@mozilla.com>
Desc: Bug 1158715 - XSS/HTML injection in TV Smart System app
 2015-05-01 10:30:36 -07:00
Ryan VanderMeulen
f3e32f8fe2 Merge m-c to inbound. a=merge 
CLOSED TREE
 2015-05-01 10:50:07 -04:00
Boris Zbarsky
20e682ed97 Bug 1160190 followup. Make ServiceWorker actually disabled on mulet so we can reopen the CLOSED TREE. r=bkelly 2015-05-01 10:33:23 -04:00
B2G Bumper Bot
b35da7a91f Bumping manifests a=b2g-bump 2015-05-01 04:39:46 -07:00
B2G Bumper Bot
2bfa1ea880 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/1bbaa54b674c
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1159674 - merge pull request #29794 from andreastt:bug_1159674 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/932f4ce02cf6
Author: Andreas Tolfsen <ato@mozilla.com>
Desc: Bug 1159674 - Introduce NoSuchWindowException in gaia-ui-tests; r=davehunt
 2015-05-01 04:37:34 -07:00
B2G Bumper Bot
f617eabb0a Bumping manifests a=b2g-bump 2015-04-30 18:43:08 -07:00
B2G Bumper Bot
46aa7ad312 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/513f75827c68
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1159982 - merge pull request #29822 from jrburke:bug1159982-email-addr-scroll-dir to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/7abcdc49ade6
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1159982 - [RTL][Email] Long email address is not correctly displayed on email address dialog
 2015-04-30 18:40:23 -07:00
B2G Bumper Bot
5480e4de6c Bumping manifests a=b2g-bump 2015-04-30 16:47:51 -07:00
B2G Bumper Bot
9304918be4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/0fa4b6da0a19
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1149070 - merge pull request #29462 from jrburke:bug1149070-text-selection-email-compose to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/c6832dfb2d5b
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1149070 - [Text Selection] Right caret disappeared in email select all
 2015-04-30 16:45:36 -07:00
B2G Bumper Bot
9b3132d93a Bumping manifests a=b2g-bump 2015-04-30 15:57:18 -07:00
B2G Bumper Bot
23a9337203 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/fad3ec1819fa
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #29756 from sfoster/ftu-change-btn-bug-1157173

Bug 1157173 - Rejigger change button styles

Test run at https://treeherder.mozilla.org/#/jobs?repo=gaia&revision=ce5f36766914c645ccab5bb0bb6bc9be55d2e96b was green, landing manually

========

https://hg.mozilla.org/integration/gaia-central/rev/587d4d6d4a3d
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1157173 - Rejigger change button styles. r=mhenretty
 2015-04-30 15:55:06 -07:00
B2G Bumper Bot
9605ed5cdf Bumping manifests a=b2g-bump 2015-04-30 15:13:17 -07:00
B2G Bumper Bot
d1671bfc8f Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/45c1d03f8a48
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1157159 - merge pull request #29781 from mikehenrty:bug-1157159-button-padding to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/8f06eee50cc0
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1157159 - Adjust button padding to account for gecko patch in bug 1010675

========

https://hg.mozilla.org/integration/gaia-central/rev/0f781e1f7e45
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1159474 - merge pull request #29797 from gaye:bug-1159474-db.js-in-worker to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/fa1aca48a712
Author: gaye <gaye@mozilla.com>
Desc: Bug 1159474 - Bring up db.js in v3 worker r=millermedeiros
 2015-04-30 15:10:34 -07:00
B2G Bumper Bot
54f34b0eab Bumping manifests a=b2g-bump 2015-04-30 14:50:03 -07:00
B2G Bumper Bot
7f346a8820 Bumping manifests a=b2g-bump 2015-04-30 14:22:29 -07:00
B2G Bumper Bot
4c21ac5918 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f8904d6b3b68
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #29782 from davidflanagan/bug1159092

Bug 1159092 - get ellipsis on the correct side for lockscreen and notifi... r=dkuo

========

https://hg.mozilla.org/integration/gaia-central/rev/f1563c82ea5d
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1159092 - get ellipsis on the correct side for lockscreen and notification screen playback controls.

fix the new tests
 2015-04-30 14:20:17 -07:00
B2G Bumper Bot
799ddd72b9 Bumping manifests a=b2g-bump 2015-04-30 13:34:51 -07:00
B2G Bumper Bot
b036ca08f3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/25d855df79ba
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #29766 from gasolin/issue-1154209

Bug 1154209 - [l10n][Camera]Arabic:The checkboxes will be overlapped with the text in the Website Permission view, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/76122f05b7a5
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1154209 - [l10n][Camera]Arabic:The checkboxes will be overlapped with the text in the Website Permission view, r=alive
 2015-04-30 13:32:35 -07:00
B2G Bumper Bot
4194f13352 Bumping manifests a=b2g-bump 2015-04-30 12:13:06 -07:00
B2G Bumper Bot
80c0338abb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/0db33b0413bc
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #29818 from gaye/bug-1155708-marionette-client-1.7.5

Bug 1155708 - Make Marionette.Element#size and #location use element rect r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/285edfffef89
Author: gaye <gaye@mozilla.com>
Desc: Bug 1155708 - Make Marionette.Element#size and #location use element rect
 2015-04-30 12:10:22 -07:00
B2G Bumper Bot
87d9baea79 Bumping manifests a=b2g-bump 2015-04-30 11:52:22 -07:00
B2G Bumper Bot
e96e14c6fa Bumping gaia.json for 6 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/284a417c898e
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1135233 - merge pull request #29129 from FunkTron:Bug1135233 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/781f1d51a43d
Author: Ross <bugzilla@imross.com>
Desc: Bug 1135233 - Made sure #statusbar-tray icons are accessible when utility tray is open

========

https://hg.mozilla.org/integration/gaia-central/rev/ea54ea169526
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152683 - merge pull request #29778 from mcav:replyto to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/0fa0e9985249
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 1152683 - [email] reply-to header ignored. r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/dee998f7ce82
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1156089 - merge pull request #29583 from KevinGrandon:bug_1156089_fl_jshint to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/180b19c07b96
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1156089 - Fix remaining fl jshint issues
 2015-04-30 11:50:10 -07:00
Ryan VanderMeulen
f52c58117a Merge m-c to b2g-inbound. a=merge 2015-04-30 14:03:11 -04:00