diff options
| author | Kim Alvefur <zash@zash.se> | 2013-10-15 01:38:02 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-10-15 01:38:02 +0200 |
| commit | 66da3ac69a0c272a954278914cd7c4d7061bc344 (patch) | |
| tree | b0fe7dbc40ec776c811a1efc89510497970b46c7 /prosody | |
| parent | e8b3b94f25770dc15f108a4657c67845718b1cde (diff) | |
| parent | e9b5aeb4c32a14773844d2e04cbde694e9521727 (diff) | |
| download | prosody-66da3ac69a0c272a954278914cd7c4d7061bc344.tar.gz prosody-66da3ac69a0c272a954278914cd7c4d7061bc344.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions