diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-22 18:46:59 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-22 18:46:59 +0100 |
| commit | 9dd235d53bbb77efa67543e0057d093789ca2ddd (patch) | |
| tree | 15d7151c2609ac821e0dd08e27f67795300b090d /prosody | |
| parent | cccb4ab09be9573c02e0d2684e062363cd7eb068 (diff) | |
| parent | ed8199402ff2a84e57f256818ebc2c505c2ac41d (diff) | |
| download | prosody-9dd235d53bbb77efa67543e0057d093789ca2ddd.tar.gz prosody-9dd235d53bbb77efa67543e0057d093789ca2ddd.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions