[packages/php: 2/2] Merge branch 'master' of git://git.pld-linux.org/packages/php

[glen]

commit 5222d679a4d6e115b037a23d780924d16a305e2b
Merge: d60d173 b8c0ecc
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Aug 26 22:44:34 2012 +0300

    Merge branch 'master' of git://git.pld-linux.org/packages/php

 php.spec | 229 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 116 insertions(+), 113 deletions(-)
---