]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 11:43:58 +0000 (12:43 +0100)
committerFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 11:43:58 +0000 (12:43 +0100)
commit4d8c167ccdf108775899317a73dbe27351f2f040
tree5b16e2e1800282c358692322974b18a6d0a55a48
parent1bb0500a9194cbe8581fc2b3529faaf2ee793baf
parent8bb84693b3fdc7dfddcdeb1b5c409b5b37774ae8
Merge branch 'PHP-5.6'

* PHP-5.6:
  mention the apparmor support in fpm