aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-23 15:38:38 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-23 15:38:38 +0100
commitc953a057a8fb1e0b0617dd090ab4ff7a643956c3 (patch)
tree6c5314d0829139cb9ef4d305679085eb744b1577 /core
parent9c847957b9e4e7a90fcdf39ac349f48eb93c4a21 (diff)
parent5468423a19fc09b010d0c4aa92e486ecbe0c9dae (diff)
downloadprosody-c953a057a8fb1e0b0617dd090ab4ff7a643956c3.tar.gz
prosody-c953a057a8fb1e0b0617dd090ab4ff7a643956c3.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions