diff options
author | Tobias Markmann <tm@ayena.de> | 2009-09-06 22:08:05 +0200 |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2009-09-06 22:08:05 +0200 |
commit | 3818d632a94e41da909eb15f04859872be8d6b19 (patch) | |
tree | ba766e78e67ddb137fa0ce25dcc287bf0e21eb94 /core | |
parent | 62ef87bb8fd695c0c63fd07b83dee477d7b365d6 (diff) | |
parent | 9be45d05d6ec13ec468e2fcbe5da1ef8791af141 (diff) | |
download | prosody-3818d632a94e41da909eb15f04859872be8d6b19.tar.gz prosody-3818d632a94e41da909eb15f04859872be8d6b19.zip |
Automated merge with http://prosody.im/source/hg
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions