]> git.pld-linux.org Git - packages/php.git/commit
Merge branch 'PHP_5_6'
authorElan Ruusamäe <glen@delfi.ee>
Fri, 27 Feb 2015 15:30:11 +0000 (17:30 +0200)
committerElan Ruusamäe <glen@delfi.ee>
Fri, 27 Feb 2015 15:57:12 +0000 (17:57 +0200)
commit76178fddebceacb12ce8000f092333cbee4c1c9a
treef80599105176e0a93377f123fc58ba0926239966
parent762ec2ebe80654582c9a5f1114691cd6d673d513
parent1a0f4cce58129d1fd47f36e41fd415cc783655ce
Merge branch 'PHP_5_6'

Conflicts:
      fpm-conf-split.patch
      php.spec
php.spec
This page took 0.039957 seconds and 4 git commands to generate.