Andreas Fischer 38e6196127 Merge branch 'master' into php5
* master:
  ASN1: empty constructed context-specific tags error'd out

Conflicts:
	phpseclib/File/ASN1.php
2015-01-11 16:09:50 +01:00
..
2015-01-11 16:09:50 +01:00
2014-12-15 14:29:20 -08:00