From 56999f00cc0f3090c5609a7edb284b28b62f871d Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 28 Oct 2013 11:51:00 +0530
Subject: [PATCH] Skip over unimplemented timezone format specifier in strptime

Fix pulled in as a result of the rebase.
---
 glibc.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/glibc.spec b/glibc.spec
index 70d67a8..72477fe 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1622,6 +1622,7 @@ rm -f *.filelist*
 %changelog
 * Mon Oct 28 2013 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.18.90-13
 - Sync with upstream master.
+  - Skip over unimplemented timezone format specifier in strptime (#947722).
 
 * Mon Oct 21 2013 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.18.90-12
 - Allow fill_archive to be called with NULL fname.