aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-16 02:04:16 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-16 02:04:16 +0000
commit975be94ee27690746706dfc360730ae0fbb8f754 (patch)
tree3fbbe3f3f815458324ce332aaf8fcdd0df642e45 /core
parentacd137be67750781431861d432d63adf74f40305 (diff)
parent619f61c2860780d8588ad589d988535b3e2af13a (diff)
downloadprosody-975be94ee27690746706dfc360730ae0fbb8f754.tar.gz
prosody-975be94ee27690746706dfc360730ae0fbb8f754.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions