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 | 08eceec2bf30cec73020e3926f7dd2fca5aba3ab (patch) | |
tree | bbb6068989d701249c75d0626778b76d2343ef54 /doc | |
parent | b41b25c119c4e4676865ab3748e67a07cd41af71 (diff) | |
parent | 012519b6ad7e4a8487b5bb143c081a4e0600a65b (diff) | |
download | prosody-08eceec2bf30cec73020e3926f7dd2fca5aba3ab.tar.gz prosody-08eceec2bf30cec73020e3926f7dd2fca5aba3ab.zip |
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions