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 | 67f8011e81614c5bf876f983990915b8641fcde3 (patch) | |
| tree | d14b44262cee1dc74af32fbaa4658385b9552152 /core | |
| parent | f2b3328bc1fb3dce23a783e2cd8932d0e1fba864 (diff) | |
| parent | b0282b758f6d2abaeb9d3ead0dc9e04c3ad13430 (diff) | |
| download | prosody-67f8011e81614c5bf876f983990915b8641fcde3.tar.gz prosody-67f8011e81614c5bf876f983990915b8641fcde3.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions