wing328 ac2cb647b5 Merge branch 'php-fix-array-handling' of https://github.com/arnested/swagger-codegen into arnested-php-fix-array-handling
Conflicts:
	modules/swagger-codegen/src/main/resources/php/model.mustache
	samples/client/petstore/php/SwaggerClient-php/README.md
	samples/client/petstore/php/SwaggerClient-php/docs/FormatTest.md
	samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
2016-05-06 10:46:36 +08:00
..