From 50c6d95dc00cfb83a7b93c1a5a264f5dd6f9c977 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Mon, 19 Sep 2011 13:04:02 -0400
Subject: [PATCH 1/2] -updated changelog for 1.9.4 release

---
 Changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog b/Changelog
index 8109d770f..3bca6feab 100644
--- a/Changelog
+++ b/Changelog
@@ -14,6 +14,9 @@
     -Fixed issue where upgrading from any previous Airtime would set "Toronto/America" as the default timezone
     -Fixed playout engine (Pypo) using a large amount of CPU when there was a long history of played shows
     -Fixed playout engine (Pypo) using 100% CPU when it could not connect to RabbitMQ
+    -Fixed issue where incorrect Start Date and Time entered for a new show was not handled gracefully
+    -Fixed issue where using Cyrillic characters in a show name would sometimes cause it to not play
+    -Fixed pypo hanging if web server is unavailable
     
 1.9.3 - August 26th, 2011
   *Improvements

From a61b48a79565bbc31d167749b0143c35d3cf7588 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Mon, 19 Sep 2011 16:18:49 -0400
Subject: [PATCH 2/2] CC-2834: Playlist items drag underneath playlist editor
 layer

---
 airtime_mvc/application/layouts/scripts/library.phtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/layouts/scripts/library.phtml b/airtime_mvc/application/layouts/scripts/library.phtml
index cd55c2ec5..2e4536188 100644
--- a/airtime_mvc/application/layouts/scripts/library.phtml
+++ b/airtime_mvc/application/layouts/scripts/library.phtml
@@ -19,7 +19,8 @@
 </div>
 
 <div class="wrapper">
-	<div id="library_content" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded"><?php echo $this->layout()->library ?></div>
+    <!--Set to z-index 254 to make it lower than the top-panel and the ZFDebug info bar, but higher than the side-playlist-->
+	<div id="library_content" class="tabs ui-widget ui-widget-content block-shadow omega-block padded" style="z-index:254"><?php echo $this->layout()->library ?></div>
 	<div id="side_playlist" class="ui-widget ui-widget-content block-shadow omega-block"><?php echo $this->layout()->spl ?></div>
 </div>
 </body>