diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-26 16:25:17 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-26 16:25:17 +0100 |
| commit | 1e12e0070326cb85095bd48c932c70d975928f95 (patch) | |
| tree | 860acbb782aa41c41e784e9e2b24cddc760392b2 /core | |
| parent | 9db4ba52f9cbab52721ed819e4e81f3cbd62d106 (diff) | |
| parent | ec56b1a798e4a91ce5beaeeeee5d45847cd38a31 (diff) | |
| download | prosody-1e12e0070326cb85095bd48c932c70d975928f95.tar.gz prosody-1e12e0070326cb85095bd48c932c70d975928f95.zip | |
Merge with backout
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions