aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-05 17:40:12 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-05 17:40:12 +0100
commitf2b3328bc1fb3dce23a783e2cd8932d0e1fba864 (patch)
treed14b44262cee1dc74af32fbaa4658385b9552152 /core
parent7a97efab5c5bf02bdba1840027de6e434b475ebb (diff)
parent2429531070ba2f2273a77c3512abbca5acda92ff (diff)
downloadprosody-f2b3328bc1fb3dce23a783e2cd8932d0e1fba864.tar.gz
prosody-f2b3328bc1fb3dce23a783e2cd8932d0e1fba864.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions