# HG changeset patch
# User Julio C. Rocha <juniel_katarn@netbeans.org>
# Date 1425613464 28800
# Node ID 6b5e5bedcd2acffd2f4fa6dd6c477640e7999327
# Parent  a43788ed267dd53d525b08c9005e0510e92b6faf# Parent  d9d35d3ede8721e7af0fb5789ab6e2f5b6acbb81
Merged python.editor changes (trivial merge).