diff lisp/time-stamp.el @ 87135:04590cd6c71c

Resolve commit conflict.
author Deepak Goel <deego@gnufans.org>
date Thu, 06 Dec 2007 17:18:13 +0000
parents 9355f9b7bbff
children f1154b4e2454 f55f9811f5d7
line wrap: on
line diff