]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 21:16:34 +0000 (14:16 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 21:16:34 +0000 (14:16 -0700)
* PHP-5.5:
  Use pkg-config to detect iodbc


Trivial merge