diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-12-19 02:36:56 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-12-19 02:36:56 +0000 |
commit | 78f2f18560b18c46edcb82fc2a3003c16161c172 (patch) | |
tree | f89adcb4bdcbb588bce7d6c2f44ef0ac8f431d3c /core | |
parent | a64a22accd5e565b66204001e7183227cabd7866 (diff) | |
parent | 70c61a59def387a4aa1439aacbdba15a16a702d7 (diff) | |
download | prosody-78f2f18560b18c46edcb82fc2a3003c16161c172.tar.gz prosody-78f2f18560b18c46edcb82fc2a3003c16161c172.zip |
Merge 0.8->trunk (uh-oh)
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions