From 7ff23a5218e05ae7e543e31f18b1a3fbe650e4cb Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 18 May 2009 16:21:42 +0000
Subject: - Fixed an attribute error introduced in 0.5.4 which would occur when
 merge() was used with an incomplete object.

---
 lib/sqlalchemy/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sqlalchemy/__init__.py')

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index b28de9bc8..5502aa7b8 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -107,6 +107,6 @@ from sqlalchemy.engine import create_engine, engine_from_config
 __all__ = sorted(name for name, obj in locals().items()
                  if not (name.startswith('_') or inspect.ismodule(obj)))
                  
-__version__ = '0.5.4'
+__version__ = '0.5.4p1'
 
 del inspect, sys
-- 
cgit v1.2.1