Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/emacs

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2014-06-04 23:36:10
Author local date 2014-06-05 01:36:10 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2014-06-04 23:36:10
Committer local date 2014-06-05 01:36:10 +0200
Commit 85a53d1d4d0694aefd8239bf9566b35970a52bab
Tree ff627b5b017b7654b32996d5b6fe60c32ab72d84
Parent 33b752dde5bdde4fe68d3e289937a5acfe34c3bd
Parent e1ab22d9e9530d6f26b1ffc45d3a1c385c4b5fa0
Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/emacs
ViewGit