aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-03-18 10:33:38 +0000
committerMatthew Wild <mwild1@gmail.com>2011-03-18 10:33:38 +0000
commit54a5982b5d000a98726601dada57050ac5cb21b4 (patch)
treea6d0807e4dba931a6e0d15137416c3a532c2161f /core
parente36d79db428adb4af47928707d90a2c598d93cb8 (diff)
parentceffa60caf80a654620c0d78d5d9cec76d305a0b (diff)
downloadprosody-54a5982b5d000a98726601dada57050ac5cb21b4.tar.gz
prosody-54a5982b5d000a98726601dada57050ac5cb21b4.zip
Merge 0.8->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions