aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-06-07 01:29:34 +0100
committerMatthew Wild <mwild1@gmail.com>2011-06-07 01:29:34 +0100
commit7d8433ac020c30ba9d3a73956ecabf6822e97d76 (patch)
treeb14478387b7fa4ac1cf1e954ca9515f983df0291 /core
parentcc5269517df6d8643437875bb49baec4bd3e6f87 (diff)
parent7c6db5e1b2d8579501981b1010574f0363330d28 (diff)
downloadprosody-7d8433ac020c30ba9d3a73956ecabf6822e97d76.tar.gz
prosody-7d8433ac020c30ba9d3a73956ecabf6822e97d76.zip
Merge 0.8->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions