]> scripts.mit.edu Git - wizard.git/commit
Merge branch 'master' of /mit/ezyang/wizard
authorEdward Z. Yang <ezyang@mit.edu>
Fri, 21 Aug 2009 06:13:46 +0000 (02:13 -0400)
committerEdward Z. Yang <ezyang@mit.edu>
Fri, 21 Aug 2009 06:13:46 +0000 (02:13 -0400)
commitcb0c00508ccd2893121416c5eb53066099fe8868
tree7a5ef2a539aebf43462e155cb65652851f6b8a7a
parent50e8a0eacc9da055edd8e120a78060d6027e44aa
parent255245146b500845fa13a75bfbeb6cece074417c
Merge branch 'master' of /mit/ezyang/wizard

Conflicts:
wizard/command/migrate.py
wizard/command/upgrade.py

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
wizard/command/migrate.py
wizard/command/upgrade.py
wizard/shell.py