Merge branch 'master' into php5

* master:
  Remove space at end of line in tests/File/ASN1/DevTest.php.
This commit is contained in:
Andreas Fischer 2014-04-18 18:03:03 +02:00
commit b471d7bc3e