# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1299619139 18000
# Node ID 885670f0a069553622984ca023d41484be634ffb
# Parent  3820fddc9005eec2141dfadfacddf1a3cfea85fe# Parent  d253b64148058b565a6925a7c5ecc4c0c218b612
Merge.

diff -r 3820fddc9005 -r 885670f0a069 doc/strftimedammit.txt