Fix issue with merge-pr.py script#12083

Closed

wesm wants to merge 2 commits intopandas-dev:masterfrom

wesm:dev/merge-pr-bugfix

Commits on Jan 18, 2016

BUG: move merge-pr.py to scripts/ and fix bug
wesm
committed

Commits on Jan 19, 2016

Trim backporting/charry-picking cruft likely not needed for pandas
wesm
committed