diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-19 20:10:23 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-19 20:10:23 +0100 |
| commit | f27987785f1a4cce95652eb87eea5d2281d13d4d (patch) | |
| tree | 5110e98da3ce0b1a10fa2300eee28a6b6b566fe1 /core | |
| parent | 741b175347e86a18273060fc884b1d5c8899cc5e (diff) | |
| parent | e4186638c7e61215b1df2020a98ae5e7dce313f4 (diff) | |
| download | prosody-f27987785f1a4cce95652eb87eea5d2281d13d4d.tar.gz prosody-f27987785f1a4cce95652eb87eea5d2281d13d4d.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions