Software /
code /
prosody
Diff
util/datetime.lua @ 490:9087f39b4222
Another automatic merge, this gets annoying."
author | Tobias Markmann <tm@ayena.de> |
---|---|
date | Sat, 29 Nov 2008 22:11:21 +0100 |
parent | 248:8ce9559d501a |
child | 519:cccd610a0ef9 |