merge changes from svn and git

git-svn-id: https://svn.php.net/repository/pecl/judy/trunk@331889 c90b9560-bf6c-de11-be94-00142212c4b1
Merge branch 'master' of github.com:orieg/php-judy