Merge branch 'master' of github.com:php-ds/ds

CHANGELOG.md

@@ -2,13 +2,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.0.2] - 2016-07-31
-### Added
-- Map::putAll
+## [1.0.4] - 2016-08-01
+### Fixed
+- `unserialize` memory leak when failed to unserialize.
+- `htable` bucket copy macro didn't copy the bucket's "next"
 
 ## [1.0.3] - 2016-08-01
 ### Added
-- Set::merge
+- `Set::merge`
 
 ### Fixed
 - ds_htable_put_next bucket rehash fix (see docs #4)
+- 
+## [1.0.2] - 2016-07-31
+### Added
+- `Map::putAll`

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/php-ds/extension.svg?branch=master)](https://travis-ci.org/php-ds/extension)
 [![Build status](https://ci.appveyor.com/api/projects/status/dbcssp6flml2gher?svg=true)](https://ci.appveyor.com/project/rtheunissen/extension)
-[![PECL](https://img.shields.io/badge/PECL-1.0.3-blue.svg)](https://pecl.php.net/package/ds)
+[![PECL](https://img.shields.io/badge/PECL-1.0.4-blue.svg)](https://pecl.php.net/package/ds)
 
 ## Documentation
 
@@ -76,11 +76,11 @@ It's highly recommended that you include the [polyfill](https://github.com/php-d
 
 Please see [CONTRIBUTING](CONTRIBUTING.md) for more information.
 
-### Credits
+## Credits
 
 - [Rudi Theunissen](https://github.com/rtheunissen)
 - [Joe Watkins](https://github.com/krakjoe)
 
-### License
+## License
 
 The MIT License (MIT). Please see [LICENSE](LICENSE.md) for more information.