]> granicus.if.org Git - php/commit
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)
commit756ce65b92de3be5841cd7e0a4cdef1173bc31dd
tree6e4f70383d776e4f8e2983f66ba474d2bc7e2093
parent88452629957fb196c81fc8ca7d0b057301ec182a
parent1794291ebe02d7a1c5387c1d404a9022925f5b47
Merge branch 'PHP-5.5'

* PHP-5.5:
  Use pkg-config to detect iodbc