Merge branch 'docs/#72-fix-wikipedia-link-to-proxy-pattern' into develop

Forward port #72

Author: Ocramius

CHANGELOG.md

@@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#64](https://github.com/zendframework/zend-servicemanager/pull/64) performance optimizations
+  when dealing with alias resolution during service manager instantiation
 
 ### Deprecated
 
@@ -39,6 +40,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#62](https://github.com/zendframework/zend-servicemanager/pull/62)
   [#64](https://github.com/zendframework/zend-servicemanager/pull/64) corrected benchmark assets signature
+- [#72](https://github.com/zendframework/zend-servicemanager/pull/72) corrected link to the Proxy Pattern Wikipedia
+  page in the documentation
 
 ## 3.0.1 - 2016-01-19
 

doc/book/lazy-services.md

@@ -3,7 +3,7 @@
 `Zend\ServiceManager` can use [delegator factories](delegators.md) to generate
 "lazy" references to your services.
 
-Lazy services are [proxies](http://en.wikipedia.org/wiki/Proxypattern) that
+Lazy services are [proxies](http://en.wikipedia.org/wiki/Proxy_pattern) that
 get lazily instantiated, and keep a reference to the real instance of
 the proxied service.