diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-07-03 16:58:20 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-07-03 16:58:20 +0200 |
| commit | 631bb27dcacf625e35f6dacc5e8df0b45624531a (patch) | |
| tree | 394a8755c2d4eb876ed707fd1c48006859d262d7 /ext/mysqlnd/mysqlnd.c | |
| parent | 5324416b6514b6de53e7de269bc18b5807701051 (diff) | |
| parent | 0265c2d961aa99e00361d6ab0f845dc1e8782558 (diff) | |
| download | php-git-631bb27dcacf625e35f6dacc5e8df0b45624531a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/acinclude.m4
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
0 files changed, 0 insertions, 0 deletions