]> git.pld-linux.org Git - packages/php.git/commit - php.spec
Merge branch 'PHP_5_5' into PHP_5_6
authorElan Ruusamäe <glen@delfi.ee>
Thu, 28 Aug 2014 14:06:05 +0000 (17:06 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Thu, 28 Aug 2014 14:12:37 +0000 (17:12 +0300)
commitc30618678e66b2e7cb482eb5ff3ddd58f17cc7ba
treeb756ae8b90f00c583aec84b988c69b6e4f35bf47
parent6fcd6c0add5fb7ba7053746e0fc4fdb5a15d87f1
parent59665b6aa12aba9e7daca723a90e3c9dbf2af31e
Merge branch 'PHP_5_5' into PHP_5_6

Conflicts:
php.spec
php.spec
This page took 0.896755 seconds and 4 git commands to generate.