merge revision(s) 2f916812a9b818b432ee7c299e021ec62d4727fb,ac458f6bc3c520c9f23364c85bfb033acda907a6:

	Skip test_europe_lisbon on macOS

	until we figure out why it's failing.
	---
	 test/ruby/test_time_tz.rb | 1 +
	 1 file changed, 1 insertion(+)

	Historical timezones of Lisbon in tzdata are unstable

	---
	 test/ruby/test_time_tz.rb | 3 +--
	 1 file changed, 1 insertion(+), 2 deletions(-)

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
index 6e7e813923..531d76b040 100644
--- a/test/ruby/test_time_tz.rb
+++ b/test/ruby/test_time_tz.rb
@@ -202,7 +202,7 @@ class TestTimeTZ < Test::Unit::TestCase
 
   def test_europe_lisbon
     with_tz("Europe/Lisbon") {
-      assert_equal("LMT", Time.new(-0x1_0000_0000_0000_0000).zone)
+      assert_include(%w"LMT CET", Time.new(-0x1_0000_0000_0000_0000).zone)
     }
   end if has_lisbon_tz
 
diff --git a/version.h b/version.h
index 34599a6e13..9faa45525e 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 48
+#define RUBY_PATCHLEVEL 49
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"