Launchpad itself

Merge lp:~cjwatson/launchpad/pytz-2014.10 into lp:launchpad

  1. pytz-2014.10
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: no longer in the source branch.
Merged at revision: 17289
Proposed branch: lp:~cjwatson/launchpad/pytz-2014.10
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
ztk-versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/pytz-2014.10
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+245446@code.launchpad.net

Commit message

Upgrade to pytz 2014.10.

Description of the change

pytz 2014.10, needed to fix https://bugs.launchpad.net/launchpad/+bug/1406528.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ztk-versions.cfg'
--- ztk-versions.cfg 2013-05-09 23:35:44 +0000
+++ ztk-versions.cfg 2014-12-30 15:17:27 +0000
@@ -81,7 +81,7 @@
81Pygments = 1.481Pygments = 1.4
82python-gettext = 1.082python-gettext = 1.0
83python-subunit = 0.0.783python-subunit = 0.0.7
84pytz = 2013b84pytz = 2014.10
85RestrictedPython = 3.6.085RestrictedPython = 3.6.0
86setuptools = 0.6c1186setuptools = 0.6c11
87Sphinx = 1.0.887Sphinx = 1.0.8