From: Aarni Koskela Date: Mon, 15 Jan 2018 17:23:36 +0000 (+0200) Subject: Merge branch 'maint-25' to bring CHANGES and version up to date from 2.5.3 X-Git-Tag: v2.6.0~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f0ac5a0eb8301c955bfbd5a758516a2def5381e;p=thirdparty%2Fbabel.git Merge branch 'maint-25' to bring CHANGES and version up to date from 2.5.3 `git merge -X theirs maint-25` --- 9f0ac5a0eb8301c955bfbd5a758516a2def5381e