diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-03-05 20:50:17 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-03-05 20:50:17 +0000 |
| commit | 9fc74d1c41dcaa0b256255c5ca1a96621157d270 (patch) | |
| tree | 50a8c372a53ab0e814fee4015df46d5686649052 /core | |
| parent | 26aa750e1c62b7994e790073620bf1fed7af476b (diff) | |
| parent | 5d33051ecc8a62231f0dd37f4176a87b19e83534 (diff) | |
| download | prosody-9fc74d1c41dcaa0b256255c5ca1a96621157d270.tar.gz prosody-9fc74d1c41dcaa0b256255c5ca1a96621157d270.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions