Merge from emacs-24; up to 2012-12-25T17:37:29Z!eliz@gnu.org
authorGlenn Morris <rgm@gnu.org>
Mon, 11 Mar 2013 16:31:55 +0000 (09:31 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 11 Mar 2013 16:31:55 +0000 (09:31 -0700)
commitae0d461554a9351a0d897ce0e60b47fc9670431e
treeabffca7298d82f918044e8cfe72d8f9493c31d9e
parent2523c845da0ef83046ff6f978254d43a4851b1f2
parentc69f46735f5bde557071785117eb0759829dc19c
Merge from emacs-24; up to 2012-12-25T17:37:29Z!eliz@gnu.org
admin/ChangeLog
admin/admin.el