Merge branch 'maint'masternext
commitb75f85c050ebc91256ce9d987dab3bde133c86ef
authorDavid Soria Parra <dsp@php.net>
Fri, 1 Aug 2008 15:39:55 +0000 (1 17:39 +0200)
committerDavid Soria Parra <dsp@php.net>
Fri, 1 Aug 2008 15:39:55 +0000 (1 17:39 +0200)
tree380a96eca278413e8bc2e8f03631567840992d93
parent9af3385b060e51f8cf1f2cad92526467fd25632f
parentbd4907926089b3289e0a851ac464ae512a919d97
Merge branch 'maint'