Merge remote-tracking branch 'origin/emacs-24'
commita859d1cc237eca05a8db2ccde69db9da1dc9e39c
authorAndreas Schwab <schwab@linux-m68k.org>
Sat, 13 Dec 2014 10:45:10 +0000 (13 11:45 +0100)
committerAndreas Schwab <schwab@linux-m68k.org>
Sat, 13 Dec 2014 10:45:10 +0000 (13 11:45 +0100)
tree3ec7aca0aef5547f81cb332005789a2d42861a06
parentc081fe29d709ede27b956567e7c733583f8f6c33
parentbd6c441893b918122cf920a1ecdb820e3a83ec1a
Merge remote-tracking branch 'origin/emacs-24'