Merge branch 'master' of git.framasoft.org:com-informatimago/emacs

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2016-11-06 11:07:44
Author local date 2016-11-06 12:07:44 +0100
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2016-11-06 11:07:44
Committer local date 2016-11-06 12:07:44 +0100
Commit e36b5c960e11b6ca614248be64880ffb26ae28b2
Tree d402774b1820af2eaf570edc49e6ae2454ffd7a3
Parent 4c8450c1418319e13b7f901bb14e8ae474c1aed3
Parent e283372f11ff5a4a47ff54cdb563abc67cb693ba
Merge branch 'master' of git.framasoft.org:com-informatimago/emacs
ViewGit