aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-02-12 14:21:09 +0000
committerMatthew Wild <mwild1@gmail.com>2012-02-12 14:21:09 +0000
commitbe5998772498c982f5dd192787ca12c4aad6b0dd (patch)
tree3f902ac2e0b60c993929ada10eb9f44e1d04eec4 /core
parent6bc6d030fd128c75492a467968a0f400bc54f1ca (diff)
parent621f44b14645b7f47fb7b422de4407bd04f9661a (diff)
downloadprosody-be5998772498c982f5dd192787ca12c4aad6b0dd.tar.gz
prosody-be5998772498c982f5dd192787ca12c4aad6b0dd.zip
Merge with 0.9
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions