terrafrost 33ea01f1ac Merge branch 'phpdoc-1.0' into phpdoc-2.0 ... Conflicts: phpseclib/Crypt/AES.php phpseclib/Crypt/Base.php phpseclib/Crypt/Blowfish.php phpseclib/Crypt/DES.php phpseclib/Crypt/Hash.php phpseclib/Crypt/RC2.php phpseclib/Crypt/RC4.php phpseclib/Crypt/RSA.php phpseclib/Crypt/Rijndael.php phpseclib/Crypt/TripleDES.php phpseclib/Crypt/Twofish.php phpseclib/File/ASN1.php phpseclib/File/X509.php phpseclib/Math/BigInteger.php phpseclib/Net/SCP.php phpseclib/Net/SFTP.php phpseclib/Net/SSH1.php phpseclib/Net/SSH2.php phpseclib/System/SSH/Agent.php		2015-10-12 14:10:26 -05:00
..
Agent	Merge branch 'phpdoc-1.0' into phpdoc-2.0	2015-10-12 14:10:26 -05:00
Agent.php	use self:: in phpdoc comments to reduce merge conflicts	2015-10-11 12:22:07 -05:00