diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-04-18 20:39:37 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-04-18 20:39:37 +0100 |
commit | 7fc81bfa420582ef490f78988db39941087e2e43 (patch) | |
tree | 3e38f864eecc748e87f2fbead4a6461f39337961 /core | |
parent | f92368a2cf2302c2189a3999940a4f8481747c7e (diff) | |
parent | ae8349a1e4f5706fb57c1781459d62e85024b046 (diff) | |
download | prosody-7fc81bfa420582ef490f78988db39941087e2e43.tar.gz prosody-7fc81bfa420582ef490f78988db39941087e2e43.zip |
Merge 0.8->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions