Software / code / prosody
Diff
HACKERS @ 7338:f8d37227acd7
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 05 Apr 2016 20:54:43 +0200 |
| parent | 2664:33651e3f68b2 |
| child | 7359:a5a080c12c96 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 05 Apr 2016 20:54:43 +0200 |
| parent | 2664:33651e3f68b2 |
| child | 7359:a5a080c12c96 |