diff options
| author | Kim Alvefur <zash@zash.se> | 2012-11-23 17:17:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2012-11-23 17:17:02 +0100 |
| commit | 7f7456af86f1a03716b80007f8ad55a4542783d9 (patch) | |
| tree | 493c1f07d1691e50b7e113a42783bd3baed96acb /prosody | |
| parent | 42c35b589bb632bddbf14d7a8569b71be8d461f5 (diff) | |
| parent | 22e8b30fef19893b4e521a9346b2b614486733f4 (diff) | |
| download | prosody-7f7456af86f1a03716b80007f8ad55a4542783d9.tar.gz prosody-7f7456af86f1a03716b80007f8ad55a4542783d9.zip | |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions