python/lib/moresetuptools.py: really merge
authorPaul Brossier <piem@piem.org>
Fri, 17 Mar 2017 17:51:09 +0000 (18:51 +0100)
committerPaul Brossier <piem@piem.org>
Fri, 17 Mar 2017 17:51:09 +0000 (18:51 +0100)
commit218f67058f65df1a9e1d9f310f6334c8452d5f1f
treee5cd2ae178a0bff0e728c18644c40fd48b5963de
parent0fdab5bf506f37d2469a5caa52fce9be980dde94
python/lib/moresetuptools.py: really merge
python/lib/moresetuptools.py