aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-11-15 14:07:53 -0500
committerMatthew Wild <mwild1@gmail.com>2012-11-15 14:07:53 -0500
commitb16826a916ddd7124cf4e1fc579b09f5c1a0c04f (patch)
treeb4f61532023b0ef12dadab99cc45df9e12a7502e /core
parent80711fd402439eb00afef9411334b72f6e615647 (diff)
parentcfceef5b2216cbaadec0601ded7fabcaef7377f7 (diff)
downloadprosody-b16826a916ddd7124cf4e1fc579b09f5c1a0c04f.tar.gz
prosody-b16826a916ddd7124cf4e1fc579b09f5c1a0c04f.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions