aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-11-29 07:16:45 +0500
committerMatthew Wild <mwild1@gmail.com>2012-11-29 07:16:45 +0500
commite75174bad1ad572da588bbddd452369c422054ec (patch)
tree946f436f1268fd970de15a3d8ef7d11a38fff245 /core
parent97123dfead3682296982ba4ff194c46e415165d1 (diff)
parentd7b707744de72882f42d0b688f9ecfd7f9fe3f12 (diff)
downloadprosody-e75174bad1ad572da588bbddd452369c422054ec.tar.gz
prosody-e75174bad1ad572da588bbddd452369c422054ec.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions