# HG changeset patch
# User catherine@cordelia
# Date 1241058924 14400
# Node ID fd5197498667fec7cee0698f2b6c58a265aafa95
# Parent  d68d83f4225470108002095f4a030ee73bcbddbb# Parent  fd40eca6939a0ec4d50185c4bc4bce93a78b536f
merge

diff -r fd40eca6939a -r fd5197498667 cmd2.py
--- a/cmd2.py	Thu Apr 09 00:15:33 2009 -0400
+++ b/cmd2.py	Wed Apr 29 22:35:24 2009 -0400
@@ -26,7 +26,7 @@
 import unittest, string, datetime, urllib, glob
 from code import InteractiveConsole, InteractiveInterpreter, softspace
 from optparse import make_option
-__version__ = '0.5.2'
+__version__ = '0.5.3'
 
 class OptionParser(optparse.OptionParser):
     def exit(self, status=0, msg=None):
@@ -476,8 +476,8 @@
           - terminator: ;
         - terminator: ;        
         >>> print c.parser.parseString('multiline command /* with comment in progress;').dump()
-        ['multiline', ' command /* with comment in progress;']
-        - multilineCommand: multiline        
+        ['multiline', ' command']
+        - multilineCommand: multiline
         >>> print c.parser.parseString('multiline command /* with comment complete */ is done;').dump()
         ['multiline', 'command /* with comment complete */ is done', ';', '']
         - args: command /* with comment complete */ is done
diff -r fd40eca6939a -r fd5197498667 setup.py
--- a/setup.py	Thu Apr 09 00:15:33 2009 -0400
+++ b/setup.py	Wed Apr 29 22:35:24 2009 -0400
@@ -3,7 +3,7 @@
 
 setup(
     name="cmd2",
-    version="0.5.2",
+    version="0.5.3",
     py_modules=["cmd2",],
     
     # metadata for upload to PyPI