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
170,356 Commits 1 Branch 166 Tags 1.2 GiB
4e369e3e5e
Commit Graph

6641 Commits

Author SHA1 Message Date
B2G Bumper Bot
4e369e3e5e Bumping manifests a=b2g-bump 2014-02-26 09:36:09 -08:00
B2G Bumper Bot
92ea44040e Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/ae7609835777
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #16490 from etiennesegonzac/bug-946809-ignore-multitouch-in-edge-swipe-detector

Bug 946809 - Ignore multitouch events in the edge swipe detector. r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/180fb7e6c91c
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 946809 - Ignore multitouch events in the edge swipe detector.

========

https://hg.mozilla.org/integration/gaia-central/rev/7d14cb0ff28a
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #16668 from viorelaioia/bug-977052

Intermittent in test_settings_from_message

========

https://hg.mozilla.org/integration/gaia-central/rev/37a8fb62856e
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: intermittent in test_settings_from_message
 2014-02-26 09:30:21 -08:00
B2G Bumper Bot
e3d3d9f840 Bumping manifests a=b2g-bump 2014-02-26 09:06:04 -08:00
B2G Bumper Bot
dd30732dcb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/0c8b8bcb4829
Author: AndreiH <andrei.hutusoru@softvision.ro>
Desc: Merge pull request #16671 from zacc/bug_977118

Bug 977118 - Remove switch_to_ftu from test_cost_control_ftu r=andreih

========

https://hg.mozilla.org/integration/gaia-central/rev/a8092e7424c0
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 977118 - Remove switch_to_ftu from test_cost_control_ftu r=andreih
 2014-02-26 08:55:44 -08:00
B2G Bumper Bot
26107b1f63 Bumping manifests a=b2g-bump 2014-02-26 07:56:27 -08:00
B2G Bumper Bot
cb1281dc2f Bumping gaia.json for 3 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/17cf022ed4d8
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #16662 from Archaeopteryx/email-setupInfoHeaderRemove

Bug 977039 - [email] remove obsolete string entity setup-info-header. r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/40668919fc09
Author: Sebastian Hengst <archaeopteryx@coole-files.de>
Desc: Bug 977039 - [email] remove obsolete string entity setup-info-header

========

https://hg.mozilla.org/integration/gaia-central/rev/388793d0666a
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 958733 - Never validate MMI codes in CDMA networks r=rik
 2014-02-26 07:55:22 -08:00
B2G Bumper Bot
6e8e9e82b4 Bumping manifests a=b2g-bump 2014-02-26 07:46:16 -08:00
B2G Bumper Bot
ec6dda55f5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

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

Bug 974918 - Update marionette content scripts version to 0.0.4

========

https://hg.mozilla.org/integration/gaia-central/rev/713d61db2f74
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 974918 - Update marionette content scripts version to 0.0.4
 2014-02-26 07:40:23 -08:00
B2G Bumper Bot
a09cbeed10 Bumping manifests a=b2g-bump 2014-02-26 07:06:12 -08:00
B2G Bumper Bot
cca7686dfb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/85876a536a9a
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #16632 from eeejay/bug-976684

Bug 976684 - [Settings] Fix typo in screen reader start button label.

========

https://hg.mozilla.org/integration/gaia-central/rev/825b9264f2ac
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 976684 - [Settings] Fix typo in screen reader start button label. r=kaze
 2014-02-26 07:00:23 -08:00
B2G Bumper Bot
fa55193a3a Bumping manifests a=b2g-bump 2014-02-26 06:51:27 -08:00
B2G Bumper Bot
21d3ce974c Bumping manifests a=b2g-bump 2014-02-26 06:41:08 -08:00
B2G Bumper Bot
a9f98be251 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/d9c0618194e0
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #16615 from eeejay/bug-976215

Bug 976215 - [System] Make utility tray invisible. r=21

========

https://hg.mozilla.org/integration/gaia-central/rev/72f0e4ced112
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 976215 - [System] Make utility tray invisible.
 2014-02-26 06:35:22 -08:00
B2G Bumper Bot
72e9d3714d Bumping manifests a=b2g-bump 2014-02-26 06:26:08 -08:00
B2G Bumper Bot
9190c8f36c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/647c6e6a226f
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #16620 from zacc/bug_976174

Bug 976174 - Better failure message in switch_to_keyboard() and dismiss(...

========

https://hg.mozilla.org/integration/gaia-central/rev/09baf767d5cd
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 976174 - Better failure message in switch_to_keyboard() and dismiss()
 2014-02-26 06:20:22 -08:00
B2G Bumper Bot
28df9adab5 Bumping manifests a=b2g-bump 2014-02-26 06:16:12 -08:00
B2G Bumper Bot
cc43224a74 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/91610c52ff41
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16068 from flodolo/bug932270_ampm

Bug 932270 - Make AM/PM localizable in 12 hours format

========

https://hg.mozilla.org/integration/gaia-central/rev/8e4ace68a328
Author: Francesco Lodolo (:flod) <flod@lodolo.net>
Desc: Bug 932270 - Make AM/PM localizable in 12 hours format
 2014-02-26 06:10:19 -08:00
B2G Bumper Bot
b845f18af9 Bumping manifests a=b2g-bump 2014-02-26 05:14:44 -08:00
B2G Bumper Bot
ee09862da5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/7eadade805f5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #16653 from KevinGrandon/bug_976546_utility_tray_shown

Bug 976546 - User should not be able to pull down utility tray before unlock

========

https://hg.mozilla.org/integration/gaia-central/rev/046c33eed6b5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 976546 - User should not be able to pull down utility tray before unlock
 2014-02-26 05:14:35 -08:00
B2G Bumper Bot
3a69ed10b1 Bumping manifests a=b2g-bump 2014-02-26 04:06:16 -08:00
B2G Bumper Bot
2f4a381f5d Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f8f59781300e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #16661 from KevinGrandon/ZDroid-html5fact

Bug 965302 - [Feedback] clean up HTML r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/a2f38862696f
Author: Zlatan Vasović <legospace9876@gmail.com>
Desc: Bug 965302 - [Feedback] clean up HTML r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/eb397b8d2613
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #16184 from pivanov/bug-950147

Bug 950147 - Add new Illustrative Wallpapers for v.1.4

========

https://hg.mozilla.org/integration/gaia-central/rev/ab2de2191c8f
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 950147 - Add new Illustrative Wallpapers for v.1.4
 2014-02-26 04:00:25 -08:00
B2G Bumper Bot
6e1ebdfe48 Bumping manifests a=b2g-bump 2014-02-26 02:45:51 -08:00
B2G Bumper Bot
083cbb3e56 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/89d027656c60
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #16609 from EverythingMe/bug-975917

Bug 975917 - [Everything.me] Tapping homebutton while in Collection Rena...

========

https://hg.mozilla.org/integration/gaia-central/rev/851a7258826c
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Bug 975917 - [Everything.me] Tapping homebutton while in Collection Rename mode may cause freeze [r=ranbena]
 2014-02-26 02:40:23 -08:00
B2G Bumper Bot
1ea62e8879 Bumping manifests a=b2g-bump 2014-02-26 02:30:50 -08:00
B2G Bumper Bot
eb2fa31dc7 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/8bb5b636e08b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 971654 - Correct lockscreen background sizing"

This reverts commit 21d0c2d77314325e7330daf4ebb90ed844a0c9ed.
 2014-02-26 02:25:24 -08:00
B2G Bumper Bot
cee5029711 Bumping manifests a=b2g-bump 2014-02-26 02:06:12 -08:00
B2G Bumper Bot
c23efe4ac1 Bumping gaia.json for 10 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/a4e943056dcb
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "STK DSDS - Cache multiple menus"

This reverts commit e04004412461de9365820895ae87b631e32f2487.

========

https://hg.mozilla.org/integration/gaia-central/rev/a7a477d44dae
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "STK DSDS - Showing multiple STK menu entries"

This reverts commit d67d31a4d8e72ac76c117f5c2230b3cfd5de4e8c.

========

https://hg.mozilla.org/integration/gaia-central/rev/c0c2aa453ab1
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "STK DSDS - Sending the iccId to settings for SELECT_ITEM commands"

This reverts commit 852498f25d3685ca611933951dcd6248704d6540.

========

https://hg.mozilla.org/integration/gaia-central/rev/531adaad47cc
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "STK DSDS - Support of DSDS in Settings"

This reverts commit 111bae52fbda969e587e7386dbfdf54de3ceed04.

========

https://hg.mozilla.org/integration/gaia-central/rev/9f0fd99ef806
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "Nits fixed"

This reverts commit 36333916f088cc6fafe87bc8d61d0d870db6c3f8.

========

https://hg.mozilla.org/integration/gaia-central/rev/96618ffd03cc
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "STK DSDS: Fixes a race condition in DSDS devices"

This reverts commit e6c0a6732c48ec4dffb46ab63edc149c648580ca.

========

https://hg.mozilla.org/integration/gaia-central/rev/336683f4ab21
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "STK DSDS: Nits fixed"

This reverts commit 6b5274ab6e90885c5f939345f9ff586cf3b594ff.

========

https://hg.mozilla.org/integration/gaia-central/rev/0d506070df5d
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "STK DSDS: Better (and faster) icc page loaded check - This also fix 937082"

This reverts commit 5a3b2ef8dd9ac55bccc361c2e7c1bdf93d59ee75.

========

https://hg.mozilla.org/integration/gaia-central/rev/0316edc02b84
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "STK DSDS: Nit, remove visibilitychange event on new ones"

This reverts commit 32274ee843ee3394307da8888a5015db0752b82a.

========

https://hg.mozilla.org/integration/gaia-central/rev/eb85fb0b393c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "STK DSDS: Registering icc-stkcommand system message earlier. See https://bugzilla.mozilla.org/show_bug.cgi?id=951599#c17"

This reverts commit 85ece8e6da2a888baca8d951f3a0e676f6e6bef8.
 2014-02-26 02:00:24 -08:00
B2G Bumper Bot
03aedd615f Bumping manifests a=b2g-bump 2014-02-26 01:46:46 -08:00
B2G Bumper Bot
3d0469fe5c Bumping gaia.json for 11 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/495bd3705c48
Author: Fernando Rodríguez Sela <frsela@tid.es>
Desc: Merge pull request #15532 from frsela/STK_DSDS/Bug951599

Bug 951599 - [DSDS][STK] Display multiple cards in settings, r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/6f988fcc0d5e
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: STK DSDS: Registering icc-stkcommand system message earlier. See https://bugzilla.mozilla.org/show_bug.cgi?id=951599#c17

========

https://hg.mozilla.org/integration/gaia-central/rev/ebaee64f57d0
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: STK DSDS: Nit, remove visibilitychange event on new ones

========

https://hg.mozilla.org/integration/gaia-central/rev/3560eceed606
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: STK DSDS: Better (and faster) icc page loaded check - This also fix 937082

========

https://hg.mozilla.org/integration/gaia-central/rev/f6f86a9a4d81
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: STK DSDS: Nits fixed

========

https://hg.mozilla.org/integration/gaia-central/rev/8211d758259f
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: STK DSDS: Fixes a race condition in DSDS devices

========

https://hg.mozilla.org/integration/gaia-central/rev/7a90c3ec62a1
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: Nits fixed

========

https://hg.mozilla.org/integration/gaia-central/rev/dd5b583cd8fd
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: STK DSDS - Support of DSDS in Settings

========

https://hg.mozilla.org/integration/gaia-central/rev/e5f4121f2781
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: STK DSDS - Sending the iccId to settings for SELECT_ITEM commands

========

https://hg.mozilla.org/integration/gaia-central/rev/39fc157863d7
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: STK DSDS - Showing multiple STK menu entries

========

https://hg.mozilla.org/integration/gaia-central/rev/b9e931bf9c53
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: STK DSDS - Cache multiple menus
 2014-02-26 01:45:27 -08:00
B2G Bumper Bot
22a7b74a33 Bumping manifests a=b2g-bump 2014-02-26 01:26:13 -08:00
B2G Bumper Bot
706a082f56 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/00d43174b0e8
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #16644 from dmarcos/bug975453

Bug 975453 - [B2G][Camera]Unable to stop recording video when quickly sw...

========

https://hg.mozilla.org/integration/gaia-central/rev/85f35499e33d
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 975453 - [B2G][Camera]Unable to stop recording video when quickly switching to camera mode after pressing record
 2014-02-26 01:20:24 -08:00
B2G Bumper Bot
9320a644a4 Bumping manifests a=b2g-bump 2014-02-26 00:36:09 -08:00
B2G Bumper Bot
5869e93931 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/483c00ba2b0e
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #16509 from crdlc/bug-970225

Bug 970225 - [Download Manager] Confirmation screen is displayed once fo...

========

https://hg.mozilla.org/integration/gaia-central/rev/7c6e2620aa11
Author: crdlc <crdlc@tid.es>
Desc: Bug 970225 - [Download Manager] Confirmation screen is displayed once for each selected file
 2014-02-26 00:30:20 -08:00
B2G Bumper Bot
3350f3077e Bumping manifests a=b2g-bump 2014-02-25 23:56:15 -08:00
B2G Bumper Bot
615b57d342 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/e9740002cd5e
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #16605 from alivedise/bugzilla/960667/popup-height-wrong

Bug 960667 - Fix popup height, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/2d118dd1b742
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 960667 - Fix popup height
 2014-02-25 23:50:24 -08:00
B2G Bumper Bot
7b1c5e61bb Bumping manifests a=b2g-bump 2014-02-25 23:26:32 -08:00
B2G Bumper Bot
a1c58a802f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/d1729e9d8fcc
Author: Mason Chang <mason@masonchang.com>
Desc: Merge pull request #16640 from changm/bug970284

Bug 970284 - Put Background in both System and Homescreen App. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/588d2988ee75
Author: Mason Chang <mchang@mozilla.com>
Desc: Bug 970284 - Put Background in both System and Homescreen App
 2014-02-25 23:25:23 -08:00
B2G Bumper Bot
f9f5885f4a Bumping manifests a=b2g-bump 2014-02-25 21:46:37 -08:00
B2G Bumper Bot
93efa2f7e5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/27fc76b7815a
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #16601 from EragonJ/bug-975292

Bug 975292 - [DSDS] "SIM 01" and "SIM 11" names are wrong

========

https://hg.mozilla.org/integration/gaia-central/rev/c46b6adb469d
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 975292 - [DSDS] "SIM 01" and "SIM 11" names are wrong
 2014-02-25 21:45:26 -08:00
B2G Bumper Bot
7d04667a95 Bumping manifests a=b2g-bump 2014-02-25 21:36:29 -08:00
B2G Bumper Bot
1b6625c609 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f5ec2da0b4da
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #16636 from wilsonpage/bug/975192

Bug 975192 - [B2G][Camera] No option to cancel out of taking a new photo...

========

https://hg.mozilla.org/integration/gaia-central/rev/73ad3fad8490
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 975192 - [B2G][Camera] No option to cancel out of taking a new photo for a contact
 2014-02-25 21:35:24 -08:00
Wes Kocher
b64c8d22b6 Merge m-c to b2g-inbound 2014-02-25 20:36:29 -08:00
B2G Bumper Bot
d4be7f2ad5 Bumping manifests a=b2g-bump 2014-02-25 20:20:53 -08:00
B2G Bumper Bot
74ea5d59a9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/ed483fa55e2a
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #16113 from EragonJ/bug-968692

Bug 968692 - [settings] add marionette test for Screen lock panel

========

https://hg.mozilla.org/integration/gaia-central/rev/4b21bb0c3dbe
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 968692 - [settings] add marionette test for Screen lock panel

- add lockscreen related test
 2014-02-25 20:15:26 -08:00
Wes Kocher
4b2c29ea00 Merge inbound to m-c 
--HG--
rename : mobile/android/chrome/content/PluginHelper.js => browser/metro/base/content/contenthandlers/PluginHelper.js
 2014-02-25 20:09:33 -08:00
B2G Bumper Bot
2cf7d8949a Bumping manifests a=b2g-bump 2014-02-25 20:06:27 -08:00
B2G Bumper Bot
22eef7a841 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/cc060feb1995
Author: dwi2 <dwi2@dwi2.com>
Desc: Merge pull request #16110 from masap/20140210

Bug 968050 - Erase backward compatibility codes for Bug 791506

========

https://hg.mozilla.org/integration/gaia-central/rev/bd190b5af431
Author: masap <masashi.honma@gmail.com>
Desc: Bug 968050 - Erase backward compatibility codes for Bug 791506
 2014-02-25 20:05:22 -08:00
B2G Bumper Bot
a3def00ac6 Bumping manifests a=b2g-bump 2014-02-25 13:31:32 -08:00
B2G Bumper Bot
2c51820ece Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/b2b0a8234336
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 975233 - Reorganize the rules for installing node.js modules r=yurenju
 2014-02-25 13:30:21 -08:00
B2G Bumper Bot
e0ef8ae468 Bumping manifests a=b2g-bump 2014-02-25 13:20:54 -08:00