tree 8ea99d439fdb6eea1ce2e72a46bcc7c7d1a5682d
parent 0c21214f3e583d541227df2239de377e796b55fa
parent 0256f4283987276796129b09905e71a7e3c590d3
author Victor Stinner <victor.stinner@gmail.com> 1474442191 +0200
committer Victor Stinner <victor.stinner@gmail.com> 1474442191 +0200

Merge 3.5