From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 19 Nov 2012 22:11:15 +0000 (+0000)
Subject: Merge changes made in Emacs trunk
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=a37c5ae47930c15eb3e526bc608ca464dbb19808;hp=a37c5ae47930c15eb3e526bc608ca464dbb19808;p=gnus

Merge changes made in Emacs trunk

* color.el: Don't require cl.
  (color-complement): `caddr' -> `nth 2'.
* time-date.el (time-to-seconds): De-obsolete.
---