Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/emacs
authorPascal J. Bourguignon <pjb@informatimago.com>
Wed, 28 Nov 2012 10:42:20 +0000 (11:42 +0100)
committerPascal J. Bourguignon <pjb@informatimago.com>
Wed, 28 Nov 2012 10:42:20 +0000 (11:42 +0100)
commit6002f997f7544f0d05526dcf234ec0e65ea34aea
treee7ccc6a82df9ff777a4049d0e3cc65a8941839ab
parentd1b48468ceedb1d75236052d0e705d915281c4ad
parentf2002a4bcbac2fbef5c87793a5cba1ee2fd4e6dd
Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/emacs