Merge branch 'merge-DEV_2'
[m6w6/ext-http] / .gitattributes
1 package.xml merge=touch
2 php_http.h merge=touch