PHPunit 4 compatibility
PHPunit 4 compatibility
PHPunit 4 compatibility for test files
Merge branch 'master' of https://github.com/zendframework/zf1
Updated the TLDs in Hostname validator to the latest IANA list (2014-05-01)
Merge pull request #343 from mhujer/new-tlds

Updated the TLDs in Hostname validator to the latest IANA list (2014-05-05)
Merge branch 'master' of https://github.com/zendframework/zf1
remove require PHPUNIT
remove require PHPUNIT from tests dir
iconv_set_encoding internal encoding deprecated in php 5.6
Merge pull request #347 from itscaro/fix/iconv_set_encoding_php_5.6

iconv_set_encoding - deprecated in php 5.6
Consolidate getting and setting encoding in Zend_Locale_Format
Merge pull request #332 from itscaro/master

PHPunit 4 compatibility
Update usage of iconv_get_encoding so that it is only used for PHP < 5.6.
Merge pull request #351 from akrabat/improve_iconv

Consolidate getting and setting encoding in Zend_Locale_Format
Merge pull request #353 from akrabat/iconv_get_encoding

Update usage of iconv_get_encoding so that it is only used for PHP < 5.6
Add CONTRIBUTING.md
Enhancement: support docx
Change: private > protected in order to allow ppl to fix/extend this
Fix link in CONTRIBUTING.md