aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
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
commit272ca5fce11d42d9cd3b50c0f3baa03729583443 (patch)
treea6d0807e4dba931a6e0d15137416c3a532c2161f /prosody
parent6d716b8e257b79ae6c89c4b4fe08e0fc4cebd1d7 (diff)
parentceffa60caf80a654620c0d78d5d9cec76d305a0b (diff)
downloadprosody-272ca5fce11d42d9cd3b50c0f3baa03729583443.tar.gz
prosody-272ca5fce11d42d9cd3b50c0f3baa03729583443.zip
Merge 0.8->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions