From 3d7a51f2ec0393b1a92d429ad8b0e5eb6a99cdd2 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Fri, 29 Jun 2012 18:56:49 -0400
Subject: [PATCH] Add some recent merges to the changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e94d9d07b09..176e226291b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,8 @@ Ansible Changes By Release
 * removed module debug option -D
 * added --verbose, which shows output from successful playbook operations
 * print the output of the raw command inside /usr/bin/ansible as with command/shell
+* basic setup module support for Solaris
+* ./library relative to the playbook is always in path so modules can be included in tarballs with playbooks
 
 0.4 "Unchained" ------- May 23, 2012