Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:96349 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 2274 invoked from network); 13 Oct 2016 19:32:10 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 13 Oct 2016 19:32:10 -0000 Authentication-Results: pb1.pair.com header.from=me@daveyshafik.com; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=me@daveyshafik.com; spf=permerror; sender-id=unknown Received-SPF: error (pb1.pair.com: domain daveyshafik.com from 209.85.213.175 cause and error) X-PHP-List-Original-Sender: me@daveyshafik.com X-Host-Fingerprint: 209.85.213.175 mail-yb0-f175.google.com Received: from [209.85.213.175] ([209.85.213.175:36209] helo=mail-yb0-f175.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 57/12-41968-531EFF75 for ; Thu, 13 Oct 2016 15:32:09 -0400 Received: by mail-yb0-f175.google.com with SMTP id 191so35117385ybv.3 for ; Thu, 13 Oct 2016 12:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daveyshafik-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=SE15iaKKGYGsaDYTgqWzp3hd9AkHDXw9T4hOr0ZGpUw=; b=LsIMtoLMx1UnzgRzQQTPuzzbJr3xRWIbTB3CqgSe9tf6pAkuNoAKgYw0syTs9BTdlg /i/NfbS6uhrDc8E74QBovq8Yk0ur9IxsvwMpPGl06cahcH6J56PeSboR6IVFk68g/UZA Lkru51l8e5xFGhdc2LvgMOK1Oeo7pltuPEAFVU8+zaTX3OyGH1vi5JjJzMiqTxh3+Ys7 NseumRLItJKcG0KytXkZJOsvGs4jastnQgLU82Pi//mFvmEM/H0qqHsxX/2B9+i6AfQi 3OLNXLD3pOWtnzx+vG07+kiVLTBX1BbGohnhj6MURgRyGTJpY0/dGX3Ppl5uB9R/XK0o ZOBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=SE15iaKKGYGsaDYTgqWzp3hd9AkHDXw9T4hOr0ZGpUw=; b=m1NAoO0Csj9OG05kmyvkaIK5ZmxeW0+ji8VAOoQrybXH6dhZ+Kc5L6jp+OAjnVzRqn D56AcJobCrdpKo7A+bEQCJEehXqLnYQ8CN3B4J2DYLzTKN/uTkg17YkF72pWQbnhG4mk rkZ07+C7UzZAYZ6mjOmFBd6Oa6a2aDz1AN6c16mOErGopccI8qkqu7/hBTRo3wPewSzh Mg0yJRqOH4Kdaj+Litlo6d8jmrLG1xaCYIwWqKbX+K7Hrvbnli+WqwF4T8M0/cC2foNT hJuJkQRIfGG4T96HPjXZACqxurSkpteCrjdJJ0Ri3RT0OHJkQ2IXqTyKcRz3u0nX0x0R Z2+A== X-Gm-Message-State: AA6/9RlSHG1IY7mKOtmI4SNrQYrMAue/xqyZwNIP6+BuAdVwKD1O+oWLXDBfoO14eOW51PmaYZMvfL0rUdt1eXor X-Received: by 10.37.114.7 with SMTP id n7mr4553173ybc.90.1476387122801; Thu, 13 Oct 2016 12:32:02 -0700 (PDT) MIME-Version: 1.0 Sender: me@daveyshafik.com Received: by 10.129.179.8 with HTTP; Thu, 13 Oct 2016 12:32:02 -0700 (PDT) In-Reply-To: <9a061b1cd6a4112c2cf2ef3ba24d0b71@koti.fimnet.fi> References: <9a061b1cd6a4112c2cf2ef3ba24d0b71@koti.fimnet.fi> Date: Thu, 13 Oct 2016 12:32:02 -0700 X-Google-Sender-Auth: zBCLGVA3p_lWCi1mdCcR28WAleU Message-ID: To: =?UTF-8?Q?Lauri_Kentt=C3=A4?= Cc: "internals@lists.php.net" Content-Type: multipart/alternative; boundary=94eb2c0d1b8a01a00b053ec42a45 Subject: Re: [PHP-DEV] [!] Master merged into PHP-7.1 From: davey@php.net (Davey Shafik) --94eb2c0d1b8a01a00b053ec42a45 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, Oct 13, 2016 at 12:20 PM, Lauri Kentt=C3=A4 wrote: > On 2016-10-13 20:16, Davey Shafik wrote: > >> Can anyone shed some light on: >> >> 1) when it was merged >> 2) who merged it >> 3) how the dates are messed up >> > > > 1) and 2) > > commit fb92482c8ad1e35b82c4d7b758ae0f1f5ecd4929 > Merge: b0cacee 4b8bdac > Author: Joe Watkins > Date: Mon Oct 10 12:17:11 2016 +0100 > > Merge branch 'PHP-7.1' of https://github.com/php/php-src into PHP-7.1 How did you figure that out? :D Thanks for this :) - Davey --94eb2c0d1b8a01a00b053ec42a45--