diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:53:32 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:53:32 +0100 |
| commit | 703e7dde18717b1f0adc4891d39d288aa4258444 (patch) | |
| tree | c6d3dd80f6be503871411f837d01ca82f344457e /core | |
| parent | 0b4567a6f194544d51d8574cf94f2f06056e83d3 (diff) | |
| parent | bbf9d411b846c78408bb4429ebe2dcf3f71d27b2 (diff) | |
| download | prosody-703e7dde18717b1f0adc4891d39d288aa4258444.tar.gz prosody-703e7dde18717b1f0adc4891d39d288aa4258444.zip | |
Merge with Maranda
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions