Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commitff80437668dd0d5163c9e43f0c200b923b39166b
authorEli Zaretskii <eliz@gnu.org>
Fri, 26 Jun 2015 10:04:28 +0000 (26 13:04 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 26 Jun 2015 10:04:28 +0000 (26 13:04 +0300)
treedb941ef372749df1760363fcc59e0c15ffc11b58
parentbde61680abe71059b60a37868a804adf3d819678
parent1546c6f2b399de3dccd65bd5bdbcf1c2b7d32b04
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs