diff options
| author | Kim Alvefur <zash@zash.se> | 2013-05-26 22:59:06 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-05-26 22:59:06 +0200 |
| commit | 3050ac293682e300f7ed14deb1a0d6dca5ae3307 (patch) | |
| tree | df0a0b0399c45ce7406755d83fcdaa8c7f24b116 /prosody | |
| parent | cc88321c964ed69fcd619af590b0faf28dd093ab (diff) | |
| parent | 8072bfb662cdfb331c0d32dbc718751b7602f758 (diff) | |
| download | prosody-3050ac293682e300f7ed14deb1a0d6dca5ae3307.tar.gz prosody-3050ac293682e300f7ed14deb1a0d6dca5ae3307.zip | |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions