Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/emacs
authorPascal J. Bourguignon <pjb@informatimago.com>
Thu, 4 Apr 2013 00:15:52 +0000 (02:15 +0200)
committerPascal J. Bourguignon <pjb@informatimago.com>
Thu, 4 Apr 2013 00:15:52 +0000 (02:15 +0200)
commitbb8dd003b22e6f6a6ff899304e3ef6389f3d4bec
tree5415d6e72d5bc23b187ac3a1e87cfa727814ac32
parentb6c5081dd5b548a596237e2e668ea682b5bfa92f
parent6187fcd1cd59aff9850769dc1d8f4e35ad7345d3
Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/emacs

Merging changes from two sites.