diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-05-19 16:33:18 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-05-19 16:33:18 +0100 |
commit | 326cc2e44d412a5a9ea46309bf923282220cf0b6 (patch) | |
tree | 14a722959d1179338adec58efd9e5d7fcfa58ada /doc | |
parent | 527e1e4bad2c8536f9c0b905e77d2679ca9ae9d5 (diff) | |
parent | cc380360ef8163b0922b2e31eced37ce9b64c45e (diff) | |
download | prosody-326cc2e44d412a5a9ea46309bf923282220cf0b6.tar.gz prosody-326cc2e44d412a5a9ea46309bf923282220cf0b6.zip |
Merge with trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions