From 00087198e03ae002ee1cd7ce9e318725cb977f2f Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Thu, 6 Jun 2013 10:24:14 -0500
Subject: [PATCH] R-2.5.1

---
 CHANGELOG | 8 ++++++++
 Makefile  | 2 +-
 VERSION   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9479ab84..051a3fdf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+## 2.5.1
+
+- New style virtual fields in grid
+- Conditional fields (experimental) ``db.table.field.show_id = db.table.otherfield==True`` or ``db.table.field.show_id = db.table.otherfiel.contains(values)``
+- auth.settings.manager_group_role="manager" enables http://.../app/appadmin/auth_manage and http://.../app/appadmin/manage for members of the "manager" group. (also experimental)
+- Fixed memory leak when using the TAG helper
+
+
 ## 2.4.7
 
 - pypy support, thanks Niphlod
diff --git a/Makefile b/Makefile
index 7228a446..14a8d6d9 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.4.7-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.5.1-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
diff --git a/VERSION b/VERSION
index b816fa7e..835f64bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.7-stable+timestamp.2013.06.04.16.40.00
+Version 2.5.1-stable+timestamp.2013.06.06.10.23.23