diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:25:45 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:25:45 +0000 |
| commit | 9de25d7789ed5974d66a396aa1c5908e7d74bf29 (patch) | |
| tree | 0fc9c99439149af544531ccd36cfeb50aabf0418 /core | |
| parent | 07151a029c71a7d868003f5ab3c76d4e9812eb2d (diff) | |
| parent | dc4689b625060e77b2c555e71e353719b48d5401 (diff) | |
| download | prosody-9de25d7789ed5974d66a396aa1c5908e7d74bf29.tar.gz prosody-9de25d7789ed5974d66a396aa1c5908e7d74bf29.zip | |
Merge backout
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions