diff options
author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-01-02 03:28:00 +0100 |
---|---|---|
committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-01-02 03:28:00 +0100 |
commit | 929d62053a4c7878190dd3157017f04c6b47db0a (patch) | |
tree | ad1d8110441c0f1a55d7303e85c1710d36ff0b1a /psycopg/python.h | |
parent | 7e9be4c1338d0479346fee89ec76a28f04ba3b7a (diff) | |
parent | 3cc8719998931051f26321329cf8e7d507f3c35e (diff) | |
download | psycopg2-929d62053a4c7878190dd3157017f04c6b47db0a.tar.gz |
Merge branch 'python2' into python3
Conflicts:
NEWS-2.3
setup.py
Diffstat (limited to 'psycopg/python.h')
0 files changed, 0 insertions, 0 deletions