merge 3.3

This commit is contained in:
Benjamin Peterson 2012-10-09 11:16:13 -04:00
commit 29e02a2be8
10 changed files with 17 additions and 21 deletions

View file

@ -2551,8 +2551,8 @@ def cli():
if opt == '-w':
writing = True
if start_server == True:
if port == None:
if start_server:
if port is None:
port = 0
browse(port, open_browser=open_browser)
return