Subject: bug#24905: 25.1.50; Lock-up in python-mode

From: Eli Zaretskii <[email-masked]>
Date: Wed, 09 Nov 2016 17:42:21 +0200

> From: Daniel Colascione <[email-masked]>
> Date: Tue, 08 Nov 2016 15:34:09 -0800
> Cc: [email-masked]
> 
> Fixed in master and emacs-25.

Thanks.

In the future, when the same fix should be applied to both branches,
please push only to the release branch, and either merge to master, or
wait for someone else to do that as part of the periodic merges.
Separate commits to each branch should only be done if each branch
gets a different changeset.