am c7fda6a9: am d4623e56: am b338ea30: Merge "Upgrade to tzdata2012f."

* commit 'c7fda6a96daeb6d089f3d8f4426b6fc211017289': Upgrade to tzdata2012f.
2012-09-13 15:36:03 -07:00
parent 3d01901774 c7fda6a96d
commit 953dbbda49
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 @@
-2012e
+2012f