diff options
| author | Kim Alvefur <zash@zash.se> | 2013-04-17 19:11:57 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-04-17 19:11:57 +0200 |
| commit | 3b6ed12bb6225d37e234c6c994b2114f1e5e0b84 (patch) | |
| tree | bbb6068989d701249c75d0626778b76d2343ef54 /prosody | |
| parent | d138cfd437d5f9df479bf12adebefc9431953de9 (diff) | |
| parent | 998b0c1b8b39f8033fdfe1439afb533455ba15d5 (diff) | |
| download | prosody-3b6ed12bb6225d37e234c6c994b2114f1e5e0b84.tar.gz prosody-3b6ed12bb6225d37e234c6c994b2114f1e5e0b84.zip | |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions