[docky] fixing changelog after conflict merge

[lzap]

commit cfdb68345cd07c7d0a2086a081e913a869ced418
Author: Lukas Zapletal <lzap+git at redhat.com>
Date:   Fri Jul 27 12:55:42 2012 +0200

    fixing changelog after conflict merge

 docky.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/docky.spec b/docky.spec
index b8f24ee..2d7588a 100644
--- a/docky.spec
+++ b/docky.spec
@@ -130,8 +130,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
-* Tue Mar 03 2012 Lukas Zapletal <lzap+rpm[@]redhat.com> - 2.1.4-1
-- version bump - new 2.1 stable
+* Fri Jul 27 2012 Lukas Zapletal <lzap+rpm[@]redhat.com> - 2.1.4-1
+- version bump - new 2.1 stable branch
 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild