Merge branch 'master' into develop

This commit is contained in:
Lance Stout 2012-08-01 11:11:54 -07:00
commit 2f4149c7d0

View File

@ -72,7 +72,7 @@ nodeprep = stringprep_profiles.create(
bidi=True, bidi=True,
mappings=[ mappings=[
stringprep_profiles.b1_mapping, stringprep_profiles.b1_mapping,
stringprep_profiles.c12_mapping], stringprep.map_table_b2],
prohibited=[ prohibited=[
stringprep.in_table_c11, stringprep.in_table_c11,
stringprep.in_table_c12, stringprep.in_table_c12,