From 12831e769b9d627cbbfc6e854b70e28f966c600c Mon Sep 17 00:00:00 2001
From: Earl Miles <merlin@logrus.com>
Date: Tue, 3 Apr 2007 16:36:05 +0000
Subject: [PATCH] commit prior to a release just to get people to stop reporting this bug

---
 CHANGELOG.txt  |    2 +-
 panels.install |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 24e11ea..3f59549 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,4 @@
-Panels 5.x-dev
+Panels 5.x-1.2
   o Block visibility code used improper array_merge, causing silly errors.
 
 Panels 5.x-1.1
diff --git a/panels.install b/panels.install
index fe7f6f2..9aeb3b6 100644
--- a/panels.install
+++ b/panels.install
@@ -81,4 +81,4 @@ function panels_uninstall() {
  */
 function panels_update_1() {
   return _system_update_utf8(array('panels_info', 'panels_area'));
-}
\ No newline at end of file
+}
-- 
1.7.4.1