Port the fix for #1299 to the trunk and change trunk version to 1.5

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index bda59989a..c25fe65c0 100755
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ AUTHOR              = "Travis E. Oliphant, et.al."
 AUTHOR_EMAIL        = "oliphant@enthought.com"
 PLATFORMS           = ["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"]
 MAJOR               = 1
-MINOR               = 4
+MINOR               = 5 
 MICRO               = 0
 ISRELEASED          = False
 VERSION             = '%d.%d.%d' % (MAJOR, MINOR, MICRO)