From 592630d5ca33039e3c9275e8bb3a87cfd4abc535 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bogdando@mail.ru>
Date: Thu, 23 May 2013 13:38:03 +0300
Subject: [PATCH] Edit Changelog

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
---
 CHANGELOG | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ede0318ef2..f3b1e407fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
-3.0-alpha-136-g485bddf
-- Merged master branch 2.2-folsom-79-g13cd2ad into grizzly
+3.0-alpha-174-g94a98d6
+- Merge from master branch
+- Rsyslog tuning
+- Puppet debug output
+- Centos 6.4
 
 2.1-folsom-docs-324-g61d1599
 - Grizzly support for centos simple