diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-03-04 22:28:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-03-04 22:28:15 +0000 |
| commit | 26aa750e1c62b7994e790073620bf1fed7af476b (patch) | |
| tree | 3a2a3a3b984030b3f04665ea994437f9c09addf4 /core | |
| parent | 1322d44e8dd886c16d3edf548af37c2e3d054480 (diff) | |
| parent | 2d56536be48758e1332090eb6528f8a294887468 (diff) | |
| download | prosody-26aa750e1c62b7994e790073620bf1fed7af476b.tar.gz prosody-26aa750e1c62b7994e790073620bf1fed7af476b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions