aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-18 11:14:16 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-18 11:14:16 +0100
commit36f5626183cfd790106eddd85a5a301735004480 (patch)
treea3a9a8ff5de3a20a633b079bd5e5e81eaaad39af /prosody
parenta7771524cb1b8dae8b1d1a58d49f1f00e4b15444 (diff)
parent7d92759bf8162dab463e4624a26642c1015a44d8 (diff)
downloadprosody-36f5626183cfd790106eddd85a5a301735004480.tar.gz
prosody-36f5626183cfd790106eddd85a5a301735004480.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions