Merge remote-tracking branch 'origin/master' into issue-104-cannot-exec-setuids
authorJeff Quast <jquast@io.com>
Fri, 19 Dec 2014 01:36:05 +0000 (17:36 -0800)
committerJeff Quast <jquast@io.com>
Fri, 19 Dec 2014 01:36:22 +0000 (17:36 -0800)
commitad7c35dce59db55f9d3dd5fea8b925abc81211ca
tree4b27b6eccfe88e656f0d69b0edf27a461fa3fe47
parent01ea0ff440facd47894c076747488c28291a47cc
parent77357d107b1ebb38287695149d7cf1e66df4addd
Merge remote-tracking branch 'origin/master' into issue-104-cannot-exec-setuids

Conflicts:
pexpect/__init__.py
pexpect/__init__.py
pexpect/utils.py