From 0afa0418a8a49d281027a78c8bf5d171a6dd5592 2008-08-17 10:47:12
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2008-08-17 10:47:12
Subject: [PATCH] Merge with upstream
---

diff --git a/IPython/Release.py b/IPython/Release.py
index 2de71df..f2889d6 100644
--- a/IPython/Release.py
+++ b/IPython/Release.py
@@ -25,7 +25,7 @@ name = 'ipython'
 development = False    # change this to False to do a release
 version_base = '0.9.beta2'
 branch = 'ipython'
-revision = '1103'
+revision = '1104'
 
 if development:
     if branch == 'ipython':
diff --git a/tools/testrel b/tools/testrel
index 21f6c0e..2746afe 100755
--- a/tools/testrel
+++ b/tools/testrel
@@ -2,7 +2,7 @@
 
 # release test
 
-ipdir=~/ipython/ipython
+ipdir=$PWD/..
 ipbackupdir=~/ipython/backup
 
 cd $ipdir
diff --git a/tools/testupload b/tools/testupload
index 7024e67..c2a19c0 100755
--- a/tools/testupload
+++ b/tools/testupload
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# clean public testing/ dir and upload
-#ssh "rm -f ipython@ipython.scipy.org:www/dist/testing/*"
-cd ~/ipython/ipython/dist
+ipdir=$PWD/..
+
+cd $ipdir/dist
 scp * ipython@ipython.scipy.org:www/dist/testing/