Remove CONTRIBUTIONS.md and merge it's contents with CHANGELOG.md.

2 files changed, 12 insertions, 12 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4c1b75..5e270b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,21 @@
 
 ## Unreleased
 
+* [**Steven Proctor**:](https://github.com/stevenproctor)
+  Updated link to posix-spawn in README.md.
+* [**Akshay Karle**:](https://github.com/akshaykarle)
+  Added the functionality to reflect $stderr when using live_stream.
+* [**Tyler Cipriani**:](https://github.com/thcipriani)
+  Fixed typos in the code.
+
+## Last Release: 1.4.0 (08/04/2014)
+
+* [**Chris Armstrong**:](https://github.com/carmstrong)
+  Added error? to check if the command ran successfully. MIXLIB-18.
+
 * Improved process cleanup on timeouts.
 * Enabled travis.
-* Added error? to check if the command ran successfully. MIXLIB-18.
 * Remove GC.disable hack for non-ruby 1.8.8
 * Handle ESRCH from getpgid of a zombie on OS X
 * Fix "TypeError: no implicit conversion from nil to integer" due to nil "token" passed to CloseHandle. MIXLIB-25.
 * $stderr of the command process is now reflected in the live_stream in addition to $stdout. (MIXLIB-19)
-## Last Release: 1.3.0 (12/03/2013)
diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
deleted file mode 100644
index 9356c4e..0000000
--- a/CONTRIBUTIONS.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<!---
-This file is reset every time a new release is done. The contents of this file are for the currently unreleased version.
-
-Example Contribution:
-* **kalistec**: Improved file resource greatly.
--->
-# mixlib-shellout Contributions:
-
-* **carmstrong**: Added error? method to see if the command was successful.
-* **akshaykarle**: Added the functionality to reflect $stderr when using live_stream.