Index: head/contrib/tzdata
===================================================================
--- head/contrib/tzdata	(revision 352238)
+++ head/contrib/tzdata	(revision 352239)

Property changes on: head/contrib/tzdata
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,54 ##
   Merged /user/ngie/release-pkg-fix-tests/contrib/tzdata:r298865-299093
   Merged /projects/pf/head/contrib/tzdata:r263908
   Merged /projects/release-embedded/contrib/tzdata:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808
   Merged /user/ngie/socket-tests/contrib/tzdata:r293882-293885,294103,294117,294119-294120,294245-294247,294488,294555,294643-294644
   Merged /projects/largeSMP/contrib/tzdata:r221273-222812,222815-223757
   Merged /projects/zfsd/head/contrib/tzdata:r266519,269993
   Merged /projects/netbsd-tests-update-12/contrib/tzdata:r303985-305318
   Merged /projects/bsnmp-improved-ipv6-support/contrib/tzdata:r301868
   Merged /projects/netbsd-tests-upstream-01-2017/contrib/tzdata:r312125-313435
   Merged /projects/lldb-r201577/contrib/tzdata:r262185-262527
   Merged /projects/clang-sparc64/contrib/tzdata:r262258-262612
   Merged /projects/quota64/contrib/tzdata:r184125-207707
   Merged /projects/cxl_iscsi/contrib/tzdata:r291227-291228,292618
   Merged /projects/random_number_generator/contrib/tzdata:r254613-256243
   Merged /projects/mpsutil/contrib/tzdata:r286179-290100
   Merged /projects/elftoolchain/contrib/tzdata:r260687-261245
   Merged /user/ngie/bsnmp_cleanup/contrib/tzdata:r295193
   Merged /projects/collation/contrib/tzdata:r286424-290491
   Merged /projects/ipfw/contrib/tzdata:r267383-272837
   Merged /user/ngie/more-tests2/contrib/tzdata:r288935-289179,289223-289224,289226-289227,289230,289236,289325,289437,289440,289478,289484-289486,290904,290921
   Merged /projects/release-arm-redux/contrib/tzdata:r278203,278595-278597,278610,280643-280650,280652,280655,282539-282546,282548,282553-282557,282564,282566,282570,282573,282587-282593,282596-282607,282615-282616,282624-282629,282631,282633,282635-282640,282642,282647-282648,282653-282654,282656-282657,282659,282662-282667,282682,282691
   Merged /projects/release-arm64/contrib/tzdata:r281786,281788,281792
   Merged /projects/openssl111/contrib/tzdata:r339079
   Merged /projects/vnet/contrib/tzdata:r295220
   Merged /projects/release-pkg/contrib/tzdata:r274131-298104
   Merged /projects/elftoolchain-update-r3130/contrib/tzdata:r276164,276167,276170-276172
   Merged /user/ngie/more-tests/contrib/tzdata:r281427-281428,281430,281432,281450,281460,281464-281465,281485,281489-281491,281515,281519,281589,281593-281597,281619,284388,288316,288321-288327,288422,288476,288478-288481,288483,288578,288650-288651,288655-288656,288659-288661,288663,288673-288676,288680,288828,288930-288932
   Merged /projects/clang-trunk/contrib/tzdata:r283596-287505
   Merged /vendor/device-tree/dist/contrib/tzdata:r303380
   Merged /projects/building-blocks/contrib/tzdata:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673
   Merged /projects/contrib-netbsd-update-12/contrib/tzdata:r303899-303984
   Merged /projects/bsd_rdma_4_9/contrib/tzdata:r319973-326168
   Merged /projects/head_mfi/contrib/tzdata:r233621
   Merged /projects/clang800-import/contrib/tzdata:r343202-344778
   Merged /projects/clang400-import/contrib/tzdata:r311132-314524
   Merged /projects/clang500-import/contrib/tzdata:r316992-321352
   Merged /projects/clang600-import/contrib/tzdata:r326936-327339,327341-327933
   Merged /projects/clang700-import/contrib/tzdata:r336870-341824
   Merged /projects/fuse2/contrib/tzdata:r344558-350621,350944,350955
   Merged /projects/clang350-import/contrib/tzdata:r274961-275126,275128-275133,275135-276476
   Merged /vendor/resolver/dist/contrib/tzdata:r1540-186085
   Merged /projects/clang360-import/contrib/tzdata:r277327-280030
   Merged /projects/clang370-import/contrib/tzdata:r287506-288928
   Merged /projects/clang380-import/contrib/tzdata:r292913-296412
   Merged /projects/pms/contrib/tzdata:r285199-285661
   Merged /projects/clang390-import/contrib/tzdata:r303250-308866,308868-309123
   Merged /projects/clang391-import/contrib/tzdata:r309166-310192
   Merged /user/ngie/make_check/contrib/tzdata:r291879-295379
   Merged /projects/bectl/contrib/tzdata:r336666-337662
   Merged /projects/multi-fibv6/head/contrib/tzdata:r230929-231848
   Merged /user/delphij/zfs-arc-rebase/contrib/tzdata:r281754
   Merged /user/ngie/bug203673/contrib/tzdata:r289470-289489
   Merged /projects/import-googletest-1.8.1/contrib/tzdata:r344081-345031,345036,345038,345042,345045,345047
   Merged /vendor/tzdata/dist:r352236