From 71ee72015b5181b8d3021b472271ac0b9a6b14f0 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Sun, 1 Sep 2013 00:56:47 -0400
Subject: [PATCH] release version updates and changelog edits.

---
 CREDITS                                       | 16 ++++++++++++++++
 VERSION                                       |  2 +-
 changelog                                     |  9 +++++++++
 install_minimal/include/airtime-constants.php |  2 +-
 python_apps/api_clients/api_client.py         |  2 +-
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/CREDITS b/CREDITS
index 4f377ea52..518f7366c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,6 +2,22 @@
 CREDITS
 =======
 
+Version 2.5.0
+-------------
+
+Denise Rigato (denise.rigato@sourcefabric.org)
+  Role: Software Developer
+
+Naomi Aro (naomi.aro@sourcefabric.org)
+  Role: Software Developer
+
+Cliff Wang (cliff.wang@sourcefabric.org)
+  Role: QA
+
+Daniel James (daniel.james@sourcefabric.org)
+  Role: Documentor & QA
+
+
 Version 2.4.1
 -------------
 
diff --git a/VERSION b/VERSION
index e7467e459..5a1ef0b72 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.4.1
+PRODUCT_RELEASE=2.5.0
diff --git a/changelog b/changelog
index d5eb9175c..66da4fe23 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+2.5.0 - September 4th, 2013
+  * New features
+    * Playout History feature overhaul.
+      - custom templates for log sheets.
+      - ability to manually log an item.
+      - ability to edit a history item.
+      - 3 history views: log, file summary, show summary.
+      - hosts can now view/log their own show history.
+
 2.4.1 - August 28th, 2013
   * Bug Fixes
     * Playout Engine locking issue
diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php
index 74af70dff..61408912c 100644
--- a/install_minimal/include/airtime-constants.php
+++ b/install_minimal/include/airtime-constants.php
@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.4.1');
+define('AIRTIME_VERSION', '2.5.0');
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index 47bd5b081..d25c60f4f 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -16,7 +16,7 @@ import base64
 import traceback
 from configobj import ConfigObj
 
-AIRTIME_VERSION = "2.4.1"
+AIRTIME_VERSION = "2.5.0"
 
 
 # TODO : Place these functions in some common module. Right now, media