diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-26 14:54:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-26 14:54:39 +0100 |
| commit | 4173551bfe86132de4392086b91988ee91c46cd0 (patch) | |
| tree | 4ae873335fac8ab24744036958a1be02552a52bd /core | |
| parent | 4ca8e2aaed9b4e58ee1a9b67bb8a6d9f99e51632 (diff) | |
| parent | c24be27b2f9a76001ff4c3de442606b05543ed7e (diff) | |
| download | prosody-4173551bfe86132de4392086b91988ee91c46cd0.tar.gz prosody-4173551bfe86132de4392086b91988ee91c46cd0.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions