aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-10-10 22:26:41 +0100
committerMatthew Wild <mwild1@gmail.com>2013-10-10 22:26:41 +0100
commit1a9c14818811c0301635ed7218959dec229eaccd (patch)
treeeb2a2b549e5fcd4fa3829fe770d91bdf16912572 /core
parent6f2481503141078e2a18cc13b46fe47a81abbf82 (diff)
parent6a0511c5ebf959fa46281b1457f00783956e9fd8 (diff)
downloadprosody-1a9c14818811c0301635ed7218959dec229eaccd.tar.gz
prosody-1a9c14818811c0301635ed7218959dec229eaccd.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions