diff options
| author | Kim Alvefur <zash@zash.se> | 2013-12-18 18:37:38 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-12-18 18:37:38 +0100 |
| commit | 87ce8469aff9d28dcd58e8cc70445aa6ead376a7 (patch) | |
| tree | ff403323a5c0460440dbdb9b2925628a944d04c4 /core | |
| parent | 23495e0d6370ad80f1cb2be65f348976fe8ce616 (diff) | |
| parent | ece61cbae173be6abb4750578252f72c57b8eb8c (diff) | |
| download | prosody-87ce8469aff9d28dcd58e8cc70445aa6ead376a7.tar.gz prosody-87ce8469aff9d28dcd58e8cc70445aa6ead376a7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions