diff options
| author | Kim Alvefur <zash@zash.se> | 2013-11-13 11:59:43 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-11-13 11:59:43 +0100 |
| commit | 1712a45fdc3fb3da014ad85e97eb7c7dab855e9a (patch) | |
| tree | 35e7e5c860fce3eb29284d9bdeb98bd167cce04f /core | |
| parent | ccbb44a824513de54767d9442ab9b012d81f6b1f (diff) | |
| parent | 0dce82a095192a7a581511eb1455732e5a3da16c (diff) | |
| download | prosody-1712a45fdc3fb3da014ad85e97eb7c7dab855e9a.tar.gz prosody-1712a45fdc3fb3da014ad85e97eb7c7dab855e9a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions