]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorSara Golemon <pollita@php.net>
Wed, 4 Dec 2013 15:50:45 +0000 (07:50 -0800)
committerSara Golemon <pollita@php.net>
Wed, 4 Dec 2013 15:50:45 +0000 (07:50 -0800)
commitf0248bdce598a382899056d348d204c9d61746df
tree399aaa7619bf8c82d68b8c20998887b01bfcc31f
parent97909ef4efb6756730b814c9966579ea6ec9e3ba
parent32a4cc8353ff94d107611f00e7376e8e1baae926
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Use 'user@example.com' rather than 'user@company.com' in tests