Andreas Fischer 8101772ab4 Merge branch '1.0' into 2.0 ...

* 1.0:
  SSH2: rm unused $connectionTimeout variable
  SSH2: rm redundant code and make php4 compatable
  SSH2: timeout improvements

Conflicts:
	phpseclib/Net/SSH2.php

2015-03-30 12:46:54 +02:00

..

Crypt

DES: fix fatal error that could occur under special circumstances

2015-03-21 11:01:43 -05:00

File

Merge branch '1.0' into 2.0

2015-03-10 13:46:15 +01:00

Math

Merge branch 'master' into php5

2015-01-09 13:09:21 +01:00

Net

Merge branch '1.0' into 2.0

2015-03-30 12:46:54 +02:00

System/SSH

Merge branch 'agentforwarding-1.0' into agentforwarding-2.0

2015-03-29 10:32:30 -05:00

openssl.cnf

Cleaned up whitespace

2014-01-18 17:29:25 +00:00