Commit 18f746d9 authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch 'master' into master+ZODB4-wc2

* master:
  v↑ zodburi  (2.4.0 -> 2.5.0)
parents 739b1125 45476f54
......@@ -209,7 +209,7 @@ xml-marshaller = 1.0.2
zc.lockfile = 1.0.2
zdaemon = 4.2.0
zipp = 1.2.0:whl
zodburi = 2.4.0
zodburi = 2.5.0
zope.event = 3.5.2
paramiko = 2.1.3
CacheControl = 0.12.6:whl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment