aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-06-02 00:05:33 +0100
committerMatthew Wild <mwild1@gmail.com>2011-06-02 00:05:33 +0100
commit75594f06b2574c0798b5edc7708de796c77ceb06 (patch)
tree3f408a36d413cf741c9a211fb55b8f3d0551b652
parenta587c56a9fb55635be7ed84c58e66bd152b5293c (diff)
parent3356b04bde1a00a0bafc47f554da1e917dc7ab58 (diff)
downloadprosody-75594f06b2574c0798b5edc7708de796c77ceb06.tar.gz
prosody-75594f06b2574c0798b5edc7708de796c77ceb06.zip
Merge 0.8->trunk
0 files changed, 0 insertions, 0 deletions