Merge branch 'master' into php5

Browse Source

* master:
  HHVM does not like it when we call an non-existent parent constructor.

Conflicts:
	phpseclib/Crypt/TripleDES.php

...

This commit is contained in:

Andreas Fischer 2014-06-16 22:54:12 +02:00

parent c5421e3493 986b58ecb0

commit ab42b52ae6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available