aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-07-16 15:19:44 +0100
committerMatthew Wild <mwild1@gmail.com>2010-07-16 15:19:44 +0100
commit7abdf45d82c4805df039dc052d52814f0ae06345 (patch)
tree52fa7d0036028cfaced6522155935cc0a89ea8e8 /prosody
parente9e7b34db99c880ce1f24b6b3d04dd0a61462dfe (diff)
parent8abb723d499148393f43b49019ea00537c19d186 (diff)
downloadprosody-7abdf45d82c4805df039dc052d52814f0ae06345.tar.gz
prosody-7abdf45d82c4805df039dc052d52814f0ae06345.zip
Merge Zash->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions