Merge branch 'master' into develop

This commit is contained in:
Aldo Cortesi 2012-06-07 08:44:36 +12:00
commit 903038b8de

View File

@ -263,6 +263,7 @@ def common_options(parser):
help="Disable response pop from response flow. " help="Disable response pop from response flow. "
"This makes it possible to replay same response multiple times." "This makes it possible to replay same response multiple times."
) )
parser.add_option_group(group)
group = optparse.OptionGroup( group = optparse.OptionGroup(
parser, parser,