summaryrefslogtreecommitdiff
path: root/lib/_json.py
diff options
context:
space:
mode:
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>2012-09-27 00:38:00 +0100
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>2012-09-27 00:38:00 +0100
commit33043cd03810fd65483d53918a49576c1c143bbf (patch)
tree2da249e0df903e5b960f9acd4a71924809427c16 /lib/_json.py
parentbc1d2f5d3a7748e2f5209b46a8f0ebfb75b429a8 (diff)
parent9949e04c70386e09a4dde2371b82895b0163d9ef (diff)
downloadpsycopg2-33043cd03810fd65483d53918a49576c1c143bbf.tar.gz
Merge branch 'composite-custom' into devel
Diffstat (limited to 'lib/_json.py')
0 files changed, 0 insertions, 0 deletions