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
175,108 Commits 1 Branch 166 Tags 1.2 GiB
4d7245a38b
Commit Graph

5775 Commits

Author SHA1 Message Date
B2G Bumper Bot
4d7245a38b Bumping gaia.json for 3 gaia revision(s) a=gaia-bump 
========

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

Bug 988007 - Unable to place cursor in front of the first character on a line r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/d192dd0118c3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 988007 - Unable to place cursor in front of the first character on a line r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/7e0333b78df9
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 986173 - Disable the reflow test for now
 2014-03-26 14:20:56 -07:00
B2G Bumper Bot
b8da4b1c88 Bumping manifests a=b2g-bump 2014-03-26 13:17:50 -07:00
B2G Bumper Bot
d2b84d5b3b Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/4a044ffb9bfa
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 988516 - Disable intermittent failing test, day view events longer than 2h click after first hour
 2014-03-26 13:16:05 -07:00
B2G Bumper Bot
8957a9a213 Bumping manifests a=b2g-bump 2014-03-26 13:06:19 -07:00
B2G Bumper Bot
2cdd0728e9 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/a00c54d44096
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #16263 from yzen/969553"

This reverts commit e1c443d9ff62a21920d389be097d0e666f38e70b, reversing
changes made to e328318d5e27a3253061fb1679ab9abc82e60fcc.
 2014-03-26 13:01:11 -07:00
B2G Bumper Bot
3468639403 Bumping manifests a=b2g-bump 2014-03-26 12:31:03 -07:00
B2G Bumper Bot
02ebddca6e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/d236713a913d
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17429 from gitmai/bug-980861-balance-notification-without-sms

Bug 980861 -[Cost Control] Alarm should be notified when user configures...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/124fd49d5709
Author: mai <mri@tid.es>
Desc: Bug 980861 -[Cost Control] Alarm should be notified when user configures when use is above or when balance is below
 2014-03-26 12:25:51 -07:00
B2G Bumper Bot
91689f51e2 Bumping manifests a=b2g-bump 2014-03-26 12:16:48 -07:00
B2G Bumper Bot
46ae81b508 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/aa59bb44f163
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17650 from gitmai/bug-988264-CC-messagehandler-error-networkInterface

Bug 988264 cc messagehandler error network interface
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/47bd9f023935
Author: mai <mri@tid.es>
Desc: Bug-988264 - [Costcontrol] When date usage gets reset you can see a wrong screen
 2014-03-26 12:10:34 -07:00
B2G Bumper Bot
1ad063dd08 Bumping manifests a=b2g-bump 2014-03-26 11:47:47 -07:00
B2G Bumper Bot
c48cd29615 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/1116c5a45f5b
Author: russnicoletti <rnicoletti@mozilla.com>
Desc: Merge pull request #16531 from russnicoletti/bug-971141

Bug 971141 - make sure we don't leak memory when creating video thumbnails. r=johu

========

https://hg.mozilla.org/integration/gaia-central/rev/fe26d0b46476
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Bug 971141 - make sure we don't leak memory when creating video thumbnails during scanning
 2014-03-26 11:46:01 -07:00
B2G Bumper Bot
1303de42c4 Bumping manifests a=b2g-bump 2014-03-26 11:36:04 -07:00
B2G Bumper Bot
64034cf27a Bumping gaia.json for 5 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f1c1af1a7b66
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16263 from yzen/969553

Bug 969553 - updated the styling and markup for common tabs.

========

https://hg.mozilla.org/integration/gaia-central/rev/e6b968ca4e21
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 969553 - updated the styling and markup for common tabs.

========

https://hg.mozilla.org/integration/gaia-central/rev/b91974bfd039
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #17623 from justindarc/camera-new-features+bug988118

Bug 988118 - Gaia unit test failures on TBPL due to the camera merge

========

https://hg.mozilla.org/integration/gaia-central/rev/aa304f844924
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 988118 - Gaia unit test failures on TBPL due to the camera merge

========

https://hg.mozilla.org/integration/gaia-central/rev/53d27cca4bb0
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Revert "Merge pull request #17619 from KevinGrandon/revert_camera_features"

This reverts commit 9b093b55fd98d8a86251397a196fd9591a35a88e, reversing
changes made to c8c0c65f334a50c99638841a4593dc6394d29c62.
 2014-03-26 11:30:53 -07:00
B2G Bumper Bot
76442c3310 Bumping manifests a=b2g-bump 2014-03-26 10:37:36 -07:00
B2G Bumper Bot
1f9c1d4f25 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

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

Bug 987282 - JSHint allow getter without setter globally r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/c5385eb6122b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 987282 - JSHint allow getter without setter globally r=julienw
 2014-03-26 10:35:57 -07:00
B2G Bumper Bot
a205957faf Bumping manifests a=b2g-bump 2014-03-26 10:21:14 -07:00
B2G Bumper Bot
6a889bd03a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/8b5f1810a979
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17539 from KevinGrandon/bug_967516_enable_device_debug_default

Bug 967516 - Enable DEVICE_DEBUG by default for non production builds r=ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/1213f552a5b5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 967516 - Enable DEVICE_DEBUG by default for non production builds r=ochameau
 2014-03-26 10:11:11 -07:00
B2G Bumper Bot
f214235d55 Bumping manifests a=b2g-bump 2014-03-26 09:53:45 -07:00
B2G Bumper Bot
cf55331135 Bumping gaia.json for 5 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/ad986818e3f1
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17598 from Archaeopteryx/settings-bug987915-dumpLayersTree

Bug 987915 - [settings] 'Dump layers tree' always in English/not localized, wrong data-l10n-id used (dump-layers vs. dumps-layers). r=fabrice

========

https://hg.mozilla.org/integration/gaia-central/rev/e5cb910f228f
Author: Sebastian Hengst <archaeopteryx@coole-files.de>
Desc: Bug 987915 - [settings] 'Dump layers tree' always in English/not localized, wrong data-l10n-id used (dump-layers vs. dumps-layers)

========

https://hg.mozilla.org/integration/gaia-central/rev/854c472bf7f7
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17617 from DimiL/master

Bug 988117 - GAIA UI Test will fail if convert WifiManager to WebIDL

========

https://hg.mozilla.org/integration/gaia-central/rev/b6897bf31e6c
Author: dlee <dlee@mozilla.com>
Desc: Bug 988117 - GAIA UI Test will fail if convert WifiManager to WebIDL

========

https://hg.mozilla.org/integration/gaia-central/rev/8e67a2a5f509
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 974731 - Disable intermittent failing test, creating an event opening event in read view should display the created event in read view
 2014-03-26 09:53:34 -07:00
B2G Bumper Bot
d46e205e39 Bumping manifests a=b2g-bump 2014-03-26 08:46:51 -07:00
B2G Bumper Bot
d481a34513 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/24143ff5c718
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Revert "Revert "Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring." for suspicion of breaking gaia integration tests"

This reverts commit a968d8cd00fa1f370a2ea7e3994b5bb5391affd7.
 2014-03-26 08:40:33 -07:00
B2G Bumper Bot
6b23a6cdf4 Bumping manifests a=b2g-bump 2014-03-26 07:56:45 -07:00
B2G Bumper Bot
737a965913 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/a5b57b3a8a5b
Author: DouglasSherk <github@sherk.me>
Desc: Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik
 2014-03-26 07:50:34 -07:00
B2G Bumper Bot
df611b0c4d Bumping manifests a=b2g-bump 2014-03-26 07:37:34 -07:00
B2G Bumper Bot
0269678515 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

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

Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new ...

========

https://hg.mozilla.org/integration/gaia-central/rev/d2e978b18a15
Author: crdlc <crdlc@tid.es>
Desc: Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new contact through the dialer app

========

https://hg.mozilla.org/integration/gaia-central/rev/82d76e2bc50c
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #17632 from jmcanterafonseca/fix_date_l10n

Bug 987966 - [contacts] placeholder for date fields in add/edit mode is ...

========

https://hg.mozilla.org/integration/gaia-central/rev/ae2b21121627
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'
 2014-03-26 07:35:55 -07:00
B2G Bumper Bot
901176e205 Bumping manifests a=b2g-bump 2014-03-26 07:26:10 -07:00
B2G Bumper Bot
2c51d06239 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/48000b91778c
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" windows bustage

This reverts commit fdd45a31b8372e0f58de51af1856e0a381fe99fa.
 2014-03-26 07:21:01 -07:00
B2G Bumper Bot
2bc396e490 Bumping manifests a=b2g-bump 2014-03-26 06:32:38 -07:00
B2G Bumper Bot
c72f78fcd0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/50b59c2116fa
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #17448 from comoyo/bug986484

Bug 986484 - Make the outer div of contact details unscrollable. r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/a9bab45a7f6a
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 986484 - Make the outer div of contact details unscrollable
 2014-03-26 06:31:33 -07:00
B2G Bumper Bot
225bd8db0c Bumping manifests a=b2g-bump 2014-03-26 03:17:46 -07:00
B2G Bumper Bot
c0a8ac9c89 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/2ee76f2dca4a
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17635 from viorelaioia/bug_986531

Bug 986531 - Xfail test_sms_with_attachments due to Bug 987809

========

https://hg.mozilla.org/integration/gaia-central/rev/98769c29e5a4
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 986531 - Xfail test_sms_with_attachments due to Bug 987809

========

https://hg.mozilla.org/integration/gaia-central/rev/69fdb5d342f6
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17634 from yurenju/stage-windows-squash-2

Bug 897352 - [gaia build system] Transition to a build_stage for assembl...

========

https://hg.mozilla.org/integration/gaia-central/rev/b23875db386f
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
 2014-03-26 03:15:54 -07:00
B2G Bumper Bot
cc1d504795 Bumping manifests a=b2g-bump 2014-03-26 02:01:08 -07:00
B2G Bumper Bot
1e28da19bb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/33d54d467505
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17527 from nucliweb/985938-Contacts-Facebook-Export

Bug 985938 - [Contacts] Select mode checkbox is being overlaped by facebook indicator

========

https://hg.mozilla.org/integration/gaia-central/rev/8fb4fd39b515
Author: Joan Leon <joan.leon@gmail.com>
Desc: Bug 985938 - [Contacts] Select mode checkbox is being overlaped by facebook indicator
 2014-03-26 01:56:03 -07:00
B2G Bumper Bot
30850e90b3 Bumping manifests a=b2g-bump 2014-03-26 01:36:07 -07:00
B2G Bumper Bot
9b19e3f4d2 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/c044e7d1a266
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps"

This reverts commit 30a501409cbe9dce0ee318a8bb9341d2dcc10427.
 2014-03-26 01:30:52 -07:00
B2G Bumper Bot
b92b0441e4 Bumping manifests a=b2g-bump 2014-03-26 01:11:06 -07:00
B2G Bumper Bot
02342482c6 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/32b20a270495
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring." for suspicion of breaking gaia integration tests

This reverts commit 77b9f9e9b55801fec784dc20167c9d2a40e5346b.
 2014-03-26 01:05:56 -07:00
B2G Bumper Bot
cc79039ca6 Bumping manifests a=b2g-bump 2014-03-26 00:56:05 -07:00
B2G Bumper Bot
94c2724d34 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/ab71593de598
Author: dwi2 <dwi2@dwi2.com>
Desc: Merge pull request #17420 from dwi2/merge_bubbletea_971498_979212

Bubble-merge 971498 979212

========

https://hg.mozilla.org/integration/gaia-central/rev/a8564c770b76
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 971498 - [System2] Instantiable HomescreenLauncher

Conflicts:
	apps/system/js/homescreen_launcher.js
	apps/system/test/unit/app_window_manager_test.js
	apps/system/test/unit/bootstrap_test.js
	apps/system/test/unit/homescreen_window_test.js

Bug 979212 - Require MockHomescreenLauncher in unit test of EdgeSwipeDetector

Conflicts:
	apps/system/test/unit/bootstrap_test.js
 2014-03-26 00:50:55 -07:00
B2G Bumper Bot
a132847afb Bumping manifests a=b2g-bump 2014-03-26 00:31:06 -07:00
B2G Bumper Bot
bb5af216ff Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/91de5ff4f474
Author: GaryChen,PYChen <mmm198219@gmail.com>
Desc: Merge pull request #17504 from mpizza/Bug_961563_build_system

Bug 961563 - [TABLET] Support specifying target device type in Gaia build script. r=yurenju.

========

https://hg.mozilla.org/integration/gaia-central/rev/bfc5f924e3bd
Author: mpizza <mmm198219@gmail.com>
Desc: Bug 961563 - [TABLET] Support specifying target device type in Gaia build script.
 2014-03-26 00:25:57 -07:00
B2G Bumper Bot
297b608f4c Bumping manifests a=b2g-bump 2014-03-25 23:51:10 -07:00
B2G Bumper Bot
f9440203b8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/c0e933be736e
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17622 from yurenju/stage-windows-squash

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/4748617b9e23
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
 2014-03-25 23:46:00 -07:00
B2G Bumper Bot
444f80e6b7 Bumping manifests a=b2g-bump 2014-03-25 22:21:10 -07:00
B2G Bumper Bot
7987cd248b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/04670a88b75f
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17562 from crh0716/974253_v2

Bug 974253 - Set preferred network type on startup based on the user preference r=jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/91262c8a4d8c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 974253 - Set preferred network type on startup based on the user preference
 2014-03-25 22:16:03 -07:00
B2G Bumper Bot
198bb53252 Bumping manifests a=b2g-bump 2014-03-25 21:31:12 -07:00
B2G Bumper Bot
0811ac61da Bumping gaia.json for 8 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/4476a9df53ab
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17571 from RudyLu/keyboard/Bug983012_master

Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/9cade1438d30
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
disable after switching the keyboard as pinyin.
 - Remove the touchmove event listeners from the touched keys when
   switching layouts.

========

https://hg.mozilla.org/integration/gaia-central/rev/d3885fb8715c
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17600 from zacc/bug_987847

Bug 987847 - Debug test_settings_wallpaper.py

========

https://hg.mozilla.org/integration/gaia-central/rev/19e8381a68ca
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 987847 - Resolve timing in test_settings_wallpaper.py and re-enable

========

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

Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

========

https://hg.mozilla.org/integration/gaia-central/rev/d64c49a74f0c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

This reverts commit 2f48cfaf3dcc1732c57dbc0706819e9359d79fce, reversing
changes made to ede2b2488f467a0b8bddf5a741e07464cd15f735.

========

https://hg.mozilla.org/integration/gaia-central/rev/e5cddba3a31a
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #17615 from gaye/backout-marionette-client-bump

Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionett...

========

https://hg.mozilla.org/integration/gaia-central/rev/a6dfca16d815
Author: Gareth Aye <gaye@mozilla.com>
Desc: Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionette_client_1_1_x"

This reverts commit d19a7fb3efa74c479be7f0b24f030e9895eb4b7a, reversing
changes made to 732a35447c7da220578fc21e10fe119c2552d662.
 2014-03-25 21:21:45 -07:00
Wes Kocher
362cb153e3 Merge m-c to b2g-inbound despite the CLOSED TREE 2014-03-25 20:22:16 -07:00
Wes Kocher
0db346b4d5 Merge inbound to m-c 2014-03-25 19:54:55 -07:00
B2G Bumper Bot
a2e4f0e31b Bumping manifests a=b2g-bump 2014-03-25 13:07:32 -07:00