diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-05-01 13:57:00 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-05-01 13:57:00 +0100 |
| commit | cb0c92e2a8abcac699decd66406c46d924a31259 (patch) | |
| tree | 3e00cd2af58e4602779b13c51761bd86b48ea264 /core | |
| parent | c393bdd831fd86f4611e073b84b59ce3182a3765 (diff) | |
| parent | 22e60a6263947dacbb3adcc52b287f575a8b8a31 (diff) | |
| download | prosody-cb0c92e2a8abcac699decd66406c46d924a31259.tar.gz prosody-cb0c92e2a8abcac699decd66406c46d924a31259.zip | |
Merge s2s branch
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions