Andreas Fischer daaa931dc2 Merge branch '1.0' into 2.0 ...

* 1.0:
  callbacks - two PRs conflict sorted out. First one: e9b698fd65075273ec11a1ffae3ebeccaad6e086, fba6894474b767fcacb2dc25cae1508107b417be, 1cd286642ef6ceb5a0c2405799f68798eb20470e Second one: 16430d4d2e77e257c26b3a00542faefa56b2454e, 0cc6125f8795f577aa9e01535c1a58545e290866
  documentation fix

Conflicts:
	phpseclib/Net/SFTP.php

2015-05-03 01:10:53 +02:00

..

Crypt

Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc

2015-04-16 00:42:53 -05:00

File

rm PHP v4 compatability claim

2015-04-02 05:57:52 -05:00

Math

rm PHP v4 compatability claim

2015-04-02 05:57:52 -05:00

Net

Merge branch '1.0' into 2.0

2015-05-03 01:10:53 +02:00

System/SSH

rm PHP v4 compatability claim

2015-04-02 05:57:52 -05:00

openssl.cnf

Cleaned up whitespace

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