Merge branch 'master' into php5

* master:
  Use pwd instead of ls. If the directory is empty callback will not be called.
  Setup Travis CI phpseclib user home directory accordingly.

tests/Net/SSH2FunctionalTest.php

@@ -56,6 +56,6 @@ class Net_SSH2FunctionalTest extends PhpseclibFunctionalTestCase
             ->expects($this->atLeastOnce())
             ->method('callbackMethod')
             ->will($this->returnValue(true));
-        $ssh->exec('ls', array($callbackObject, 'callbackMethod'));
+        $ssh->exec('pwd', array($callbackObject, 'callbackMethod'));
     }
 }

travis/setup-secure-shell.sh

@@ -13,5 +13,5 @@ set -x
 USERNAME='phpseclib'
 PASSWORD='EePoov8po1aethu2kied1ne0'
 
-sudo useradd "$USERNAME"
+sudo useradd --create-home --base-dir /home "$USERNAME"
 echo "$USERNAME:$PASSWORD" | sudo chpasswd