[latex3-commits] [git/LaTeX3-latex3-latex2e] master: Merge branch 'hotfix/gh408' (5c0cb6b5)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/5c0cb6b5781ac81b8eef6fd6be309ef3c1c2f55e

>---------------------------------------------------------------

commit 5c0cb6b5781ac81b8eef6fd6be309ef3c1c2f55e
Merge: 34e70ff4 d943397c
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Oct 25 13:05:15 2020 +0100

    Merge branch 'hotfix/gh408'
    
    # Conflicts:
    #       base/ltclass.dtx


>---------------------------------------------------------------

5c0cb6b5781ac81b8eef6fd6be309ef3c1c2f55e
 base/changes.txt | 13 +++++++++----
 base/ltclass.dtx | 17 +++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --cc base/changes.txt
index a85835a6,5cf25330..29f3d293
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -10,24 -10,15 +10,29 @@@ are not part of the distribution
  All changes above are only part of the development branch for the next release.
  ================================================================================
  
+ #########################
 -# 2020-10-01 PL 1 Release
++# 2020-10-01 PL 2 Release
+ #########################
+ 
 +2020-10-23  Phelype Oleinik  <phelype.oleinik at latex-project.org>
 +
 +	* ltmiscen.dtx:
 +	Make 'enddocument/afteraux' a one-time hook (gh/418).
 +
- #########################
- # 2020-10-01 PL 2 Release
- #########################
- 
 +2020-10-18  Phelype Oleinik  <phelype.oleinik at latex-project.org>
 +
 +	* ltclass.dtx:
 +	Fix passing options to class/package in \input at path (gh/414).
 +
+ 2020-10-11  Phelype Oleinik  <phelype.oleinik at latex-project.org>
+ 
+ 	* ltclass.dtx:
+ 	Reset \@currpkg at reqd after loading a package file (gh/408).
+ 
 +#########################
 +# 2020-10-01 PL 1 Release
 +#########################
 +
  2020-10-08  Phelype Oleinik  <phelype.oleinik at latex-project.org>
  
  	* ltclass.dtx: