diff options
| author | Kim Alvefur <zash@zash.se> | 2013-12-14 17:25:55 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-12-14 17:25:55 +0100 |
| commit | 122b7f950dfaea345085c6e280dcd858914824e2 (patch) | |
| tree | f09333963a51f34667fb3267cb8ce196e84d7485 /AUTHORS | |
| parent | 02bc1d47f4a2a72a45f1a13dbb47813f274cb2d7 (diff) | |
| parent | acd137be67750781431861d432d63adf74f40305 (diff) | |
| download | prosody-122b7f950dfaea345085c6e280dcd858914824e2.tar.gz prosody-122b7f950dfaea345085c6e280dcd858914824e2.zip | |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions