]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorMatt Ficken <v-mafick@microsoft.com>
Thu, 25 Apr 2013 21:55:50 +0000 (14:55 -0700)
committerMatt Ficken <v-mafick@microsoft.com>
Thu, 25 Apr 2013 21:55:50 +0000 (14:55 -0700)
* PHP-5.5:
  Adding sys_get_temp_dir() test specific for Windows.


Trivial merge