diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-05 15:15:53 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-05 15:15:53 -0800 |
commit | ad6b96db25c9cf79e2df53d694952a3c99af293c (patch) | |
tree | c7ede2fa384fba8f1a2371131dc7d9e1307caa80 /setup.py | |
parent | 96705e26cf9ac7c9c3f6e8cd28e7e408dc5b856a (diff) | |
parent | 9886b386b1f5f026c5d3529af8dd709d85be289e (diff) |
Merge branch '1.15' into 1.16
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions