2.6.1 readiness

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.6.1 - TBD
+## 2.6.1 - 2017-01-16
 
 ### Added
 

composer.json

@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "zendframework/zend-mail": "^2.6",
-        "phpunit/PHPUnit": "~4.0",
+        "phpunit/PHPUnit": "^4.7 || ^5.7",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {

doc/book/message.md

@@ -46,6 +46,13 @@ strings and returning a `Zend\Mime\Message` instance:
 $message = Zend\Mime\Message::createFromMessage($string, $boundary);
 ```
 
+As of version 2.6.1, You may also parse a single-part message by omitting the
+`$boundary` argument:
+
+```php
+$message = Zend\Mime\Message::createFromMessage($string);
+```
+
 ## Available methods
 
 `Zend\Mime\Message` contains the following methods: