885670f0a069
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Tue, 08 Mar 2011 16:18:59 -0500 | 
| parents | 3820fddc9005 (current diff) d253b6414805 (diff) | 
| children | 62ccc1fbae2d | 
| branches/tags | (none) | 
| files | doc/strftimedammit.txt | 
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Tue, 08 Mar 2011 16:18:59 -0500 | 
| parents | 3820fddc9005 (current diff) d253b6414805 (diff) | 
| children | 62ccc1fbae2d | 
| branches/tags | (none) | 
| files | doc/strftimedammit.txt |