Граф коммитов

113 Коммитов

Автор SHA1 Сообщение Дата
Axel Hecht 8800dcd113 Bug 1321281, vendor fluent.migrate, r=flod
This vendors in updates to fluent.migrate, up to
650cd8740f
and fluent.syntax 0.15.1

Differential Revision: https://phabricator.services.mozilla.com/D40199

--HG--
extra : moz-landing-system : lando
2019-08-08 11:54:13 +00:00
Mike Hommey f7f0525dc1 Bug 1564314 - Move gdbpp back to python/. r=nalexander
Somehow bug 1346025 moved it to third_party/python but... it's not third
party code.

Differential Revision: https://phabricator.services.mozilla.com/D37364

--HG--
rename : third_party/python/gdbpp/gdbpp/__init__.py => python/gdbpp/gdbpp/__init__.py
rename : third_party/python/gdbpp/gdbpp/enumset.py => python/gdbpp/gdbpp/enumset.py
rename : third_party/python/gdbpp/gdbpp/linkedlist.py => python/gdbpp/gdbpp/linkedlist.py
rename : third_party/python/gdbpp/gdbpp/owningthread.py => python/gdbpp/gdbpp/owningthread.py
rename : third_party/python/gdbpp/gdbpp/smartptr.py => python/gdbpp/gdbpp/smartptr.py
rename : third_party/python/gdbpp/gdbpp/string.py => python/gdbpp/gdbpp/string.py
rename : third_party/python/gdbpp/gdbpp/tarray.py => python/gdbpp/gdbpp/tarray.py
rename : third_party/python/gdbpp/gdbpp/thashtable.py => python/gdbpp/gdbpp/thashtable.py
extra : moz-landing-system : lando
2019-07-11 02:39:31 +00:00
Andrew Halberstadt 54355ca715 Bug 1563797 - Vendor backports.shutil_which r=Callek
I couldn't use 'mach vendor python' to get this module in-tree because that
puts a 'backports' module on the PYTHONPATH. This is a problem because many
(most?) compatibility backports also use a 'backports' library. So in the
likely event that a user happens to have one of these installed in their
system Python, we'll search that module before the vendored one and fail to
find it.

This gets around the issue by foregoing 'backports' and just putting
'shutil_which' on the path

Differential Revision: https://phabricator.services.mozilla.com/D36838

--HG--
extra : moz-landing-system : lando
2019-07-11 14:03:30 +00:00
Andreea Pavel a35fc693c4 Backed out changeset fa94c9a03e3f (bug 1564314) for linting failures on a CLOSED TREE
--HG--
rename : python/gdbpp/gdbpp/__init__.py => third_party/python/gdbpp/gdbpp/__init__.py
rename : python/gdbpp/gdbpp/enumset.py => third_party/python/gdbpp/gdbpp/enumset.py
rename : python/gdbpp/gdbpp/linkedlist.py => third_party/python/gdbpp/gdbpp/linkedlist.py
rename : python/gdbpp/gdbpp/owningthread.py => third_party/python/gdbpp/gdbpp/owningthread.py
rename : python/gdbpp/gdbpp/smartptr.py => third_party/python/gdbpp/gdbpp/smartptr.py
rename : python/gdbpp/gdbpp/string.py => third_party/python/gdbpp/gdbpp/string.py
rename : python/gdbpp/gdbpp/tarray.py => third_party/python/gdbpp/gdbpp/tarray.py
rename : python/gdbpp/gdbpp/thashtable.py => third_party/python/gdbpp/gdbpp/thashtable.py
2019-07-10 10:12:34 +03:00
Mike Hommey 2f3833c4b3 Bug 1564314 - Move gdbpp back to python/. r=nalexander
Somehow bug 1346025 moved it to third_party/python but... it's not third
party code.

Differential Revision: https://phabricator.services.mozilla.com/D37364

--HG--
rename : third_party/python/gdbpp/gdbpp/__init__.py => python/gdbpp/gdbpp/__init__.py
rename : third_party/python/gdbpp/gdbpp/enumset.py => python/gdbpp/gdbpp/enumset.py
rename : third_party/python/gdbpp/gdbpp/linkedlist.py => python/gdbpp/gdbpp/linkedlist.py
rename : third_party/python/gdbpp/gdbpp/owningthread.py => python/gdbpp/gdbpp/owningthread.py
rename : third_party/python/gdbpp/gdbpp/smartptr.py => python/gdbpp/gdbpp/smartptr.py
rename : third_party/python/gdbpp/gdbpp/string.py => python/gdbpp/gdbpp/string.py
rename : third_party/python/gdbpp/gdbpp/tarray.py => python/gdbpp/gdbpp/tarray.py
rename : third_party/python/gdbpp/gdbpp/thashtable.py => python/gdbpp/gdbpp/thashtable.py
extra : moz-landing-system : lando
2019-07-09 16:09:14 +00:00
Axel Hecht ddd561b21c Bug 1353680, update compare-locales to 7.2.1, r=flod
Differential Revision: https://phabricator.services.mozilla.com/D29000

--HG--
extra : moz-landing-system : lando
2019-05-02 10:48:32 +00:00
Mike Shal b64b81d0c5 Bug 1522931 - Vendor biplist; r=froydnj
Differential Revision: https://phabricator.services.mozilla.com/D26390

--HG--
extra : moz-landing-system : lando
2019-04-12 19:00:15 +00:00
Csoregi Natalia efc3a9c990 Backed out 2 changesets (bug 1522931) for breaking macOS build on 10.14. a=backout
Backed out changeset 27214432fe48 (bug 1522931)
Backed out changeset 71191e5499a1 (bug 1522931)
2019-04-10 17:10:12 +03:00
Mike Shal ca72d9f976 Bug 1522931 - Vendor biplist; r=froydnj
Differential Revision: https://phabricator.services.mozilla.com/D26390

--HG--
extra : moz-landing-system : lando
2019-04-08 16:29:55 +00:00
Axel Hecht 023e478585 Bug 1540089, update l10n python toolchain to Fluent 0.9, r=stas
Differential Revision: https://phabricator.services.mozilla.com/D25403

--HG--
rename : third_party/python/compare-locales/compare_locales/tests/test_merge_dtd.py => third_party/python/compare-locales/compare_locales/tests/dtd/test_merge.py
rename : third_party/python/compare-locales/compare_locales/tests/test_dtd.py => third_party/python/compare-locales/compare_locales/tests/dtd/test_parser.py
rename : third_party/python/compare-locales/compare_locales/tests/test_merge_comments.py => third_party/python/compare-locales/compare_locales/tests/merge/test_comments.py
rename : third_party/python/compare-locales/compare_locales/tests/test_merge_messages.py => third_party/python/compare-locales/compare_locales/tests/merge/test_messages.py
rename : third_party/python/compare-locales/compare_locales/tests/test_merge_whitespace.py => third_party/python/compare-locales/compare_locales/tests/merge/test_whitespace.py
rename : third_party/python/compare-locales/compare_locales/tests/test_merge_properties.py => third_party/python/compare-locales/compare_locales/tests/properties/test_merge.py
rename : third_party/python/compare-locales/compare_locales/tests/test_properties.py => third_party/python/compare-locales/compare_locales/tests/properties/test_parser.py
extra : moz-landing-system : lando
2019-03-29 15:51:56 +00:00
Dustin J. Mitchell 14e7864a6a Bug 1508381 - vendor newest taskcluster client r=tomprince
Differential Revision: https://phabricator.services.mozilla.com/D18025

--HG--
extra : moz-landing-system : lando
2019-03-12 20:40:04 +00:00
Tom Prince 02dfab8cb7 Bug 1527858: Vendor redo==2.0.3; r=aki
There was an error in logging multiple tries. This updates redo to a version with fixed logging.

Differential Revision: https://phabricator.services.mozilla.com/D22806

--HG--
extra : moz-landing-system : lando
2019-03-09 00:05:49 +00:00
arthur.iakab c152ccec1d Backed out 4 changesets (bug 1508381) for multiple Windows build bustages CLOSED TREE
Backed out changeset f01cec6f712e (bug 1508381)
Backed out changeset ba69e59924de (bug 1508381)
Backed out changeset 97fe4e5a665e (bug 1508381)
Backed out changeset 0c3065c12bef (bug 1508381)
2019-01-31 23:14:11 +02:00
Dustin J. Mitchell dd01eb1170 Bug 1508381 - vendor newest taskcluster client r=tomprince
Note that this excludes changes to enum34 and psutil made by `mach vendor`

Differential Revision: https://phabricator.services.mozilla.com/D18025

--HG--
extra : moz-landing-system : lando
2019-01-31 20:14:24 +00:00
Rob Wu b0989a05ce Bug 1518762 - Avoid error in psutil.disk_io_counters in resourcemonitor r=ahal
Imports 8f99f37826
to fix a bug with Linux kernel 4.18+, https://github.com/giampaolo/psutil/issues/1354
(to be included in a future release of psutil, version 5.5.0)

Differential Revision: https://phabricator.services.mozilla.com/D16028

--HG--
extra : moz-landing-system : lando
2019-01-22 16:16:39 +00:00
Ted Mielczarek ce7c81cd8c bug 1518842 - fix badly-landed binary patch from bug 1481612. r=me
--HG--
extra : rebase_source : f33397f95b57dbaaa857faf6335beb4712a0a9da
2019-01-09 14:40:54 -05:00
Dustin J. Mitchell c2ecf453ff Bug 1492664 - vendor taskcluster-urls; r=gps
--HG--
extra : rebase_source : a64effde0530bcf5c3a3095745b0e7a749d75dbd
extra : source : 0699d3873e440453ce7d5cc7c398a1d076b92033
2018-09-24 16:53:45 +00:00
Sebastian Hengst 767c971623 Backed out 21 changesets (bug 1492664) for breaking cron task for nightlies. a=backout
Backed out changeset a7d50dbb2c8e (bug 1492664)
Backed out changeset 2d876c4ece8b (bug 1492664)
Backed out changeset c82285d253de (bug 1492664)
Backed out changeset bf6d089640eb (bug 1492664)
Backed out changeset d9a7f2ce49c3 (bug 1492664)
Backed out changeset 06c466ab4323 (bug 1492664)
Backed out changeset c1ea4a10cc8d (bug 1492664)
Backed out changeset 4c63a04fdd47 (bug 1492664)
Backed out changeset 742b038bb1dd (bug 1492664)
Backed out changeset 911b4b0fb683 (bug 1492664)
Backed out changeset 870c8cec99e5 (bug 1492664)
Backed out changeset 77699b51336b (bug 1492664)
Backed out changeset 29f33f22fd8b (bug 1492664)
Backed out changeset e7f305408708 (bug 1492664)
Backed out changeset 335a92b1f424 (bug 1492664)
Backed out changeset c566f1c8dcdf (bug 1492664)
Backed out changeset c77ae59aba41 (bug 1492664)
Backed out changeset 9c35dd209c6b (bug 1492664)
Backed out changeset a972d6b4434e (bug 1492664)
Backed out changeset 5ea6f03f845e (bug 1492664)
Backed out changeset 0699d3873e44 (bug 1492664)

--HG--
extra : histedit_source : 5cb1f7e50f25d4a875c1a58c86b7dce902e1a89c%2C20f1ab1a843b612cfcc67cf5c6ff745d65abf076
2018-12-20 12:43:22 +02:00
Dustin J. Mitchell 04e3a3fea3 Bug 1492664 - vendor taskcluster-urls; r=gps
--HG--
extra : rebase_source : 265f983a6ce70066e1b762ab66dd4d5fa5803ea8
2018-09-24 16:53:45 +00:00
Margareta Eliza Balazs 2e5e28f518 Backed out 16 changesets (bug 1492664) for breaking developer artifact builds, requested by standard8 a=backout
Backed out changeset 31e500489665 (bug 1492664)
Backed out changeset f4945658d45f (bug 1492664)
Backed out changeset 6d17291b8b92 (bug 1492664)
Backed out changeset 90f3faa36137 (bug 1492664)
Backed out changeset 0b229b00818a (bug 1492664)
Backed out changeset 5eb2c77d70a9 (bug 1492664)
Backed out changeset e1ebad5d89c5 (bug 1492664)
Backed out changeset 3017e5890739 (bug 1492664)
Backed out changeset c8b7e620eabf (bug 1492664)
Backed out changeset d3dfbd848236 (bug 1492664)
Backed out changeset 5c92bb5ac895 (bug 1492664)
Backed out changeset fb7cfca6ebc3 (bug 1492664)
Backed out changeset 0c4101230d4d (bug 1492664)
Backed out changeset b93a0fcc86f3 (bug 1492664)
Backed out changeset 6dc9522ee0bf (bug 1492664)
Backed out changeset 85d7f8b330eb (bug 1492664)
2018-12-19 11:45:29 +02:00
Dustin J. Mitchell fac0c5c5a8 Bug 1492664 - vendor taskcluster-urls r=firefox-build-system-reviewers,gps
`./mach vendor python taskcluster-urls==11.0.0`.

Differential Revision: https://phabricator.services.mozilla.com/D14195

--HG--
extra : moz-landing-system : lando
2018-12-11 22:20:45 +00:00
Axel Hecht 68f6838fa1 bug 1514273, update in-tree copies of compare-locales and Fluent to 5.1 and 0.10, r=stas
Differential Revision: https://phabricator.services.mozilla.com/D14574

--HG--
extra : moz-landing-system : lando
2018-12-14 19:31:11 +00:00
Axel Hecht 5c325428f0 Bug 1492070, update l10n python libraries, r=stas
update fluent.syntax to 0.9.0
update compare-locales to 5.0.2
update fluent.migrate to https://hg.mozilla.org/l10n/fluent-migration/rev/3877312dc1f4
This includes migration-specific fixes for bugs 1491591, 1491833, 1491859, 1496127

All of these changes have been reviewed before in their respective upstream
repositories.

Differential Revision: https://phabricator.services.mozilla.com/D11861

--HG--
extra : moz-landing-system : lando
2018-12-03 12:03:59 +00:00
Tom Prince fd9a27e32d Bug 1509962: Vendor redo==2.0.2; r=mtabara
Differential Revision: https://phabricator.services.mozilla.com/D12973

--HG--
extra : moz-landing-system : lando
2018-12-03 06:43:52 +00:00
Nathan Froyd c594293416 Bug 1460674 - part 4 - update gdb pretty-printing to grok the new layout; r=tromey 2018-11-26 16:24:49 -05:00
Nathan Froyd 849de57398 Bug 1481577 - make nsTHashtable pretty-printer aware of naming changes; r=tromey
kHashBits was renamed to mozilla::kHashNumberBits, which seems awkward
to access from the pretty-printer.  So we compute its value from the
HashNumber type instead.
2018-11-26 13:16:13 -05:00
Tom Prince a83d0fd435 Bug 1492128: Vendor taskcluster==4.0.1; r=firefox-build-system-reviewers,gps
We can't use taskcluster 5.0.0 yet, because taskcluster-proxy does not
support new-style URLs.

Differential Revision: https://phabricator.services.mozilla.com/D10146

--HG--
extra : moz-landing-system : lando
2018-10-30 17:50:49 +00:00
Tom Prince de09f5861b Bug 1492128: Vendor pathlib2==2.3.2; r=firefox-build-system-reviewers,gps
Differential Revision: https://phabricator.services.mozilla.com/D10145

--HG--
extra : moz-landing-system : lando
2018-10-30 18:01:06 +00:00
Tom Prince 74845297db Bug 1497575: [staging-release] Vendor mozilla-version; r=firefox-build-system-reviewers,mshal
Differential Revision: https://phabricator.services.mozilla.com/D8624

--HG--
extra : moz-landing-system : lando
2018-10-16 21:14:56 +00:00
Csoregi Natalia f00a0ea9cc Backed out 3 changesets (bug 1494069) for blocking 1498215. a=backout
Backed out changeset 9752f179b9c3 (bug 1494069)
Backed out changeset fe0fb280dbfc (bug 1494069)
Backed out changeset a2956764213e (bug 1494069)
2018-10-12 13:11:04 +03:00
Ted Mielczarek 9b25fb8826 bug 1481612 - vendor an unpacked win64 wheel of psutil 5.4.3. r=gps
This change uses the previously added `--with-windows-wheel` option to vendor
a win64 wheel of psutil. This patch was produced by running:
`mach vendor python --with-windows-wheel psutil==5.4.3`.

We vendor this wheel unpacked so that we can insert it into sys.path in mach
without needing a virtualenv in which to install a wheel with pip, since we
have a chicken-and-egg problem there where configure creates the virtualenv
but we'd like to be able to use psutil before we run configure.

Differential Revision: https://phabricator.services.mozilla.com/D3436

--HG--
extra : moz-landing-system : lando
2018-10-10 19:54:25 +00:00
Ted Mielczarek bfa7b8e5f4 bug 1481612 - Re-vendor psutil 5.4.3 using `mach vendor python`. r=chmanchester,gps
psutil was previously vendored manually, so re-vendor it using our new tooling
to make for smaller diffs in follow-up patches. This mostly just winds up
adding some extra files that must have been left out of the manual vendoring,
but it also updates the third_party/python/requirements.{in,txt}.

Differential Revision: https://phabricator.services.mozilla.com/D3434

--HG--
extra : moz-landing-system : lando
2018-10-10 19:47:58 +00:00
Andrew Halberstadt 6bc809da2d Bug 1494069 - Vendor scandir==1.9.0 to third_party/python, r=davehunt
Scandir is a faster implementation of os.listdir since it caches file metadata
as it works. Using listdir and then calling things like os.path.isfile after
the fact will result in multiple system calls. Whereas with scandir, there will
only be a single system call per file.

Scandir is part of the stdlib in Python 3.6+, so the following can be used for
Python 2/3 compatible code:

    try
        from os import scandir, walk
    except ImportError:
        from scandir import scandir, walk

Differential Revision: https://phabricator.services.mozilla.com/D7738

--HG--
extra : moz-landing-system : lando
2018-10-10 19:21:07 +00:00
Botond Ballo ff24cf5780 Bug 1496870 - Add a GDB pretty printer for mozilla::EnumSet. r=tromey
Differential Revision: https://phabricator.services.mozilla.com/D7954

--HG--
extra : moz-landing-system : lando
2018-10-10 16:33:56 +00:00
Dave Hunt 046359060c Bug 1490253 - Replace pipenv with pip-tools for vendoring packages and dependencies; r=ahal
Depends on D7869

Differential Revision: https://phabricator.services.mozilla.com/D7870

--HG--
extra : moz-landing-system : lando
2018-10-10 08:58:41 +00:00
Csoregi Natalia fbee84608f Backed out changeset f92dcf5319ae (bug 1490253) for bustage on test_mozbuild_reading.py. CLOSED TREE 2018-10-10 00:51:30 +03:00
Dave Hunt 4141a28060 Bug 1490253 - Replace pipenv with pip-tools for vendoring packages and dependencies; r=ahal
Depends on D7869

Differential Revision: https://phabricator.services.mozilla.com/D7870

--HG--
extra : moz-landing-system : lando
2018-10-09 21:32:35 +00:00
Dave Hunt 1b8dbe2a78 Bug 1490253 - Vendor pip-tools 3.0.0 and dependencies; r=ahal
Differential Revision: https://phabricator.services.mozilla.com/D7869

--HG--
extra : moz-landing-system : lando
2018-10-05 18:46:07 +00:00
Dustin J. Mitchell 55bc80584c Bug 1490128: upgrade json-e==2.7.0 r=davehunt
This was done with |mach vendor python| followed by a manual backout of changes
to unrelated packages.

Differential Revision: https://phabricator.services.mozilla.com/D5532

--HG--
extra : moz-landing-system : lando
2018-09-11 21:14:52 +00:00
Ted Mielczarek 28a107217d bug 1461992 - update vendored copy of voluptuous to 0.11.5. r=gps
voluptuous 0.11.1 added support for a `description` argument for Required and
Optional objects, which is useful for adding descriptions in the schema that
we can persist when converting it to json-schema format. This patch vendors
the current version of voluptuous, which is 0.11.5.

MozReview-Commit-ID: 2qt1KE8MPYR

Differential Revision: https://phabricator.services.mozilla.com/D2839

--HG--
extra : rebase_source : f784a529a45fd5467de4dc39ab5db1624004bf2f
2018-08-06 06:45:33 -04:00
Dave Townsend 70702c1d4a Bug 1481555: Use lldb's python API to summarise nsAtoms. r=froydnj
Differential Revision: https://phabricator.services.mozilla.com/D2894

--HG--
extra : moz-landing-system : lando
2018-08-08 15:11:22 +00:00
Axel Hecht 12d764f3a5 bug 1478343, update compare-locales to 3.3, fluent.syntax to 0.8, r=stas
This is a massive update, changes have been individually reviewed
in https://hg.mozilla.org/l10n/compare-locales

MozReview-Commit-ID: BlpuXcLoA34

--HG--
rename : third_party/python/compare-locales/compare_locales/checks.py => third_party/python/compare-locales/compare_locales/checks/dtd.py
rename : third_party/python/fluent/tools/migrate/blame.py => third_party/python/fluent/fluent/migrate/blame.py
rename : third_party/python/fluent/tools/migrate/migrate-l10n.py => third_party/python/fluent/fluent/migrate/tool.py
extra : rebase_source : fc4fedc7a8d8c83033b3c95693723e8dbf858de7
2018-07-25 15:18:06 +02:00
Dan Minor 337e0066fd Bug 1371485 - Update gyp to 4d467626b0b9f59a85fb81ca4d7ea9eca99b9d8f; r=chmanchester
Tags: #secure-revision

Bug #: 1371485

Differential Revision: https://phabricator.services.mozilla.com/D1800

--HG--
extra : rebase_source : c43b24b09e1391f7242e0cff85de67ac29a04814
2018-06-21 14:40:47 -04:00
Dave Hunt a631fc714d Bug 1472201 - Vendor pytest 3.6.2 and dependencies; r=ahal
MozReview-Commit-ID: 5qfK6OygVMH

--HG--
rename : third_party/python/pytest/_pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt => third_party/python/pluggy/LICENSE
rename : third_party/python/pytest/doc/en/example/costlysetup/sub1/__init__.py => third_party/python/pytest/doc/en/example/costlysetup/sub_a/__init__.py
rename : third_party/python/pytest/doc/en/example/costlysetup/sub1/__init__.py => third_party/python/pytest/doc/en/example/costlysetup/sub_b/__init__.py
rename : third_party/python/pytest/_pytest/_code/__init__.py => third_party/python/pytest/src/_pytest/_code/__init__.py
extra : rebase_source : d80873f2b1899decefbddddfc2f69ae045925b81
2018-06-29 15:37:31 +01:00
Dave Hunt 6a3d72d58f Bug 1428362 - Vendor blessings via |mach vendor python|; r=ahal
MozReview-Commit-ID: 7suX72iyYEV

--HG--
extra : rebase_source : 5add0fe52017f69062567debacd1967b98c0507d
extra : source : 8218a2d572c59cd4c67f115fa0c9fcd82c98f5a1
2018-05-31 13:54:43 +01:00
Dave Hunt e991dba156 Bug 1466211 - Vendor voluptuous via |mach vendor python|; r=ahal
MozReview-Commit-ID: 21q9i0lStU3

--HG--
extra : rebase_source : 966a1dd7c1c8b7786bd17de35989fef468e2baed
2018-06-01 18:56:23 +01:00
Dave Hunt c0e75ef175 Bug 1466211 - Vendor json-e via |mach vendor python|; r=ahal
MozReview-Commit-ID: DPatUFNHDIR

--HG--
extra : rebase_source : d471abd8821cd87083f48a486daed79388f6a476
2018-06-01 18:42:11 +01:00
Margareta Eliza Balazs 7a2b0ea957 Backed out 7 changesets (bug 1466211) for bustage e.g. z/task_1529662815/src/js/src/configure --enable-ctypes --enable-optimize on a CLOSED TREE
Backed out changeset 6680ca0acc27 (bug 1466211)
Backed out changeset dfdf4ea83655 (bug 1466211)
Backed out changeset 23eb377e2e6d (bug 1466211)
Backed out changeset fe821d61ecbf (bug 1466211)
Backed out changeset e04950c7c496 (bug 1466211)
Backed out changeset 4b197754381a (bug 1466211)
Backed out changeset 1695d4464c54 (bug 1466211)
2018-06-22 14:33:21 +03:00
Dave Hunt aed322c276 Bug 1466211 - Vendor voluptuous via |mach vendor python|; r=ahal
MozReview-Commit-ID: 21q9i0lStU3

--HG--
extra : rebase_source : 966a1dd7c1c8b7786bd17de35989fef468e2baed
2018-06-01 18:56:23 +01:00
Dave Hunt c1dfb5d2d3 Bug 1466211 - Vendor json-e via |mach vendor python|; r=ahal
MozReview-Commit-ID: DPatUFNHDIR

--HG--
extra : rebase_source : d471abd8821cd87083f48a486daed79388f6a476
2018-06-01 18:42:11 +01:00