Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commitcbf1c1f2c7d38b732c3e76c677478ed30a4fee14
authorEli Zaretskii <eliz@gnu.org>
Mon, 9 Feb 2015 16:27:21 +0000 (9 18:27 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 9 Feb 2015 16:27:21 +0000 (9 18:27 +0200)
tree45cabfddf80f016b3928d11fa7537649b55bd30c
parent403cb178c75a80603dbd8ed23e342d2109645401
parent2973127159944de98f1e4ece7fd46a202e1352c6
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs