Merge commit 'd16c20ffc2197234d4dd631fd66768c3a4b305c9'

diff --combined packages/names/names.el
index f0fee8d914ef2e730f7a43dfac6c6ca2706556b8,0a6d1a2c92aba41e4a1738cf7a2b990bf0e1a2f3..f4ef7bdfd69816bfb49642661d32a9068832399c
--- 1/packages/names/names.el
--- 2/names.el
+++ b/packages/names/names.el
@@@ -2,14 -2,11 +2,11 @@@
  
  ;; Copyright (C) 2014-2015 Free Software Foundation, Inc.
  
- ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
- ;; Maintainer: Artur Malabarba <bruce.connor.am@gmail.com>
- ;; URL: http://github.com/Bruce-Connor/names
+ ;; Author: Artur Malabarba <emacs@endlessparentheses.com>
+ ;; URL: https://github.com/Bruce-Connor/names
  ;; Version: 20150723.0
  ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5"))
  ;; Keywords: extensions lisp
- ;; Prefix: names
- ;; Separator: -
  
  ;;; Commentary:
  ;;
@@@ -65,7 -62,7 +62,7 @@@
        "Load autoloaded definition DEF from function named NAME."
        (unless (load (cadr def) 'noerror)
          (error "Macro `%s' is autoloaded, but its file (%s) couldn't be loaded"
 -          name (cadr def)))
 +               name (cadr def)))
        (symbol-function name))
  
      (lambda (f prop &rest _)