diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-07-25 13:02:46 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-07-25 13:02:46 +0100 |
| commit | 53a3acbd83208942350577bbe2666c0cd63f3459 (patch) | |
| tree | 56c01e1263e5c9fb3d1b580179e3bbaf119530b3 /core | |
| parent | ed90b8cac29a9890dc93d0f43b8cee84c960a1f1 (diff) | |
| parent | 9d6c2816c42ff0431b6353505443b3ddb9d9f936 (diff) | |
| download | prosody-53a3acbd83208942350577bbe2666c0cd63f3459.tar.gz prosody-53a3acbd83208942350577bbe2666c0cd63f3459.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions