diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-07-16 16:53:54 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-07-16 16:53:54 +0100 |
commit | dd08ddb30b0dff37bfda45bc408d7e9c4c670ea8 (patch) | |
tree | 97c6568f01a72ab9863ecec04fdf705134c98ef4 /core | |
parent | 7abdf45d82c4805df039dc052d52814f0ae06345 (diff) | |
parent | 1f7f8e57a3f5bbffdc261285c8ef46e9749e22d3 (diff) | |
download | prosody-dd08ddb30b0dff37bfda45bc408d7e9c4c670ea8.tar.gz prosody-dd08ddb30b0dff37bfda45bc408d7e9c4c670ea8.zip |
Merge Florob->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions