Merge from origin/emacs-24
commit3a8b7013042adae3c27327a75662fd8e884d4896
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 03:59:33 +0000 (28 00:59 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 03:59:33 +0000 (28 00:59 -0300)
tree4f66f04464e135dba69147fd6a324ceddb159e6a
parent0b2014f9cb13efdd6ebc30627d88b9a7f3a42149
parentd7af65d24ade808b44d4c936bf4b6e2eaab708cc
Merge from origin/emacs-24

The following commit was skipped:

d7af65d Backport: Unbreak `mouse-action' property in text buttons