am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev

* commit '9e6104d54f541d43d3c1b785f2dfc1d2e09c0f2f': Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 10:51:31 -07:00 · 2013-09-13 10:51:31 -07:00 · b30f6eb026
commit b30f6eb026
parent b8e1033c5b 9e6104d54f
3 changed files with 1 additions and 1 deletions
--- a/libc/zoneinfo/zoneinfo.dat
+++ b/libc/zoneinfo/zoneinfo.dat
--- a/libc/zoneinfo/zoneinfo.idx
+++ b/libc/zoneinfo/zoneinfo.idx
--- a/libc/zoneinfo/zoneinfo.version
+++ b/libc/zoneinfo/zoneinfo.version
@ -1 +1 @@
-2012h
+2013d
 @ -1 +1 @@
 h
 d