diff options
author | Kim Alvefur <zash@zash.se> | 2012-09-29 01:05:17 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2012-09-29 01:05:17 +0200 |
commit | 39c332a7dab340419b316589c647cada0e039752 (patch) | |
tree | e38cb97ac0c650ba81c8cc04ab37819ff82ce49c /core | |
parent | 385524de74065fc1ab7c80d5a9a12d14ab475e44 (diff) | |
parent | de88fd8928aefbc139e8cf4f050589b927735714 (diff) | |
download | prosody-39c332a7dab340419b316589c647cada0e039752.tar.gz prosody-39c332a7dab340419b316589c647cada0e039752.zip |
Merge 0.9 -> trunk (like this?)
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions