aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-07 18:44:23 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-07 18:44:23 +0000
commit34ea788ae497f82755f225973ab2238fd111ee53 (patch)
tree888a20a7275c0d0ae0383ef6008c4805f3de5f95 /prosody
parent0595c7a86c4ebbdab236b9f3cf2de4be84f0b90d (diff)
parent8d26c23a92e18fb829cafe285b11b2ff2f693be7 (diff)
downloadprosody-34ea788ae497f82755f225973ab2238fd111ee53.tar.gz
prosody-34ea788ae497f82755f225973ab2238fd111ee53.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions