Merge branch '2.0'

This commit is contained in:
terrafrost 2016-01-18 10:28:01 -06:00
commit f451dd28f3

View File

@ -1,4 +1,4 @@
Copyright 2007-2013 TerraFrost and other contributors Copyright 2007-2016 TerraFrost and other contributors
http://phpseclib.sourceforge.net/ http://phpseclib.sourceforge.net/
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining