Diff

Makefile @ 941:13ebec89b568

Automated merge with ssh://hg@prosody.im/prosody-hg
author Matthew Wild <mwild1@gmail.com>
date Mon, 30 Mar 2009 20:04:31 +0100
parent 586:b828d7d47973
child 987:d55ec60331e7
line wrap: on
line diff