Merge branch 'maint'
commit9af3385b060e51f8cf1f2cad92526467fd25632f
authorDavid Soria Parra <dsp@php.net>
Mon, 26 May 2008 14:01:01 +0000 (26 16:01 +0200)
committerDavid Soria Parra <dsp@php.net>
Mon, 26 May 2008 14:01:01 +0000 (26 16:01 +0200)
tree14c32c62863ecf6f894a102e4c25048a8f30b4dd
parent68c64f5a3d7f9fff7fab5c6c86af7a1174ca1ff6
parentd1bea9bb3b43b61b0daf6c9e9960f2aa90003fcf
Merge branch 'maint'