diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-21 13:59:45 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-21 13:59:45 -0800 |
| commit | c8ebe05ffc83c735ce8c73580c9cd66abf3d9a23 (patch) | |
| tree | 216b42cadc85cbe5c23cdd6e764ebcdbe046ee7e /setup.py | |
| parent | 6ecde066fcd0a23238e8b8929c4e1bef48618df1 (diff) | |
| parent | 2cf23bf784ace3d7aac0b0de54751d11590c33a0 (diff) | |
Merge branch '1.11' into 1.12
Conflicts:
NEWS
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions