diff options
author | Waqas Hussain <waqas20@gmail.com> | 2014-10-08 18:47:01 -0400 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2014-10-08 18:47:01 -0400 |
commit | e58a22fd47b0b0b50ae06527df8fa23f02e1c6a6 (patch) | |
tree | 01f86ba2dab7cddd087798294a180246a96e4c08 /prosody | |
parent | eab5feadd71d6a044ecfcc8131fd3b7ed350dc97 (diff) | |
parent | cff85755634ad9c0ae431245e835625f5c57bb82 (diff) | |
download | prosody-e58a22fd47b0b0b50ae06527df8fa23f02e1c6a6.tar.gz prosody-e58a22fd47b0b0b50ae06527df8fa23f02e1c6a6.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions