Automated merge with http://prosody.im/source/hg
authorTobias Markmann <tm@ayena.de>
Sun, 6 Sep 2009 20:08:05 +0000 (22:08 +0200)
committerTobias Markmann <tm@ayena.de>
Sun, 6 Sep 2009 20:08:05 +0000 (22:08 +0200)
commitabe193ceac85a91a4c8e93d45c046f9ed859c760
treeba766e78e67ddb137fa0ce25dcc287bf0e21eb94
parented0c3c4e76d9eb6f6a25a573f5fc57070093bcff
parent5ce9c2674ddfd693e8ffac3195d25201a6aaffd6
Automated merge with http://prosody.im/source/hg