diff options
| author | Kim Alvefur <zash@zash.se> | 2013-09-03 13:43:39 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-09-03 13:43:39 +0200 |
| commit | 75bfbe05e133c49b1d0075a13239f5f34d932a9c (patch) | |
| tree | d09d7bb967b08c4950f0f241be175d676bf61c2e /prosody | |
| parent | 01135ffd36c5718358e9770c8e005d8410511d7b (diff) | |
| parent | 69e2fd5d813240dcf2803d7531667ae96b04fbc5 (diff) | |
| download | prosody-75bfbe05e133c49b1d0075a13239f5f34d932a9c.tar.gz prosody-75bfbe05e133c49b1d0075a13239f5f34d932a9c.zip | |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions