diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-05 17:42:19 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-05 17:42:19 +0100 |
| commit | 4942d8f996e41f2fdb628ceb660d80f00637c111 (patch) | |
| tree | d14b44262cee1dc74af32fbaa4658385b9552152 /core | |
| parent | d7fbc07ca4b77809e07fc47e60f4ca87a7e9f997 (diff) | |
| parent | aa6ac860153d3e5ff9d018beb68b11e187dbdda6 (diff) | |
| download | prosody-4942d8f996e41f2fdb628ceb660d80f00637c111.tar.gz prosody-4942d8f996e41f2fdb628ceb660d80f00637c111.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions