diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-08-27 00:47:37 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-27 00:47:37 +0200 |
| commit | 1e1b7c74fb8b68aacb3948c2c499917397f82d29 (patch) | |
| tree | a43f2432649f1e4911e5739a0035ca625351c9f3 /ext/mysqlnd/mysqlnd_net.c | |
| parent | f463523cdade48b741668ae2e80c866b4e3e753e (diff) | |
| parent | 52f35b984c4a1cc6e1e951a9c1d777ceb20e5606 (diff) | |
| download | php-git-1e1b7c74fb8b68aacb3948c2c499917397f82d29.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update the GIT-RULES with the 5.6 and the release branches
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
0 files changed, 0 insertions, 0 deletions