aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-06-29 20:17:21 +0100
committerMatthew Wild <mwild1@gmail.com>2010-06-29 20:17:21 +0100
commitac2c84b749ab005099d27195c587edd1be640649 (patch)
treea990c181c9fd47e3e92d21bdc138ccaa778bf740 /core
parent9e70620d2631fff90974f2c40f435b15d8e386b1 (diff)
parent5a862cb1afc932a2a72b4f569024dd5aaddcc6b8 (diff)
downloadprosody-ac2c84b749ab005099d27195c587edd1be640649.tar.gz
prosody-ac2c84b749ab005099d27195c587edd1be640649.zip
Merge 0.7->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions