]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorFelipe Pena <felipensp@gmail.com>
Wed, 22 Aug 2012 13:51:06 +0000 (10:51 -0300)
committerFelipe Pena <felipensp@gmail.com>
Wed, 22 Aug 2012 13:51:06 +0000 (10:51 -0300)
commit596e855feb6855c236552c792d45c6259dcee406
tree3c765868e898047cda411cce46a3d2bf45df2b65
parent3938e5d616c5bfc9bc24eaed759e90608c413dc0
parent7a56ac00a04d4fc72052bb679626e723da3eef44
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)