Merge branch 'maint'
commit5a77cb4b8b316bd177c42fd0f0d22b3fb88680ab
authorDavid Soria Parra <dsp@php.net>
Mon, 12 May 2008 12:06:37 +0000 (12 14:06 +0200)
committerDavid Soria Parra <dsp@php.net>
Mon, 12 May 2008 12:06:37 +0000 (12 14:06 +0200)
tree8aacbb8d814ce29f2fc291b74b0402835cd4058a
parenta02e0939c6c99ff48737695db388adeecab34d24
parent408aa13ea0b020a9c358372736343d66735b6559
Merge branch 'maint'