Software / code / prosody
Diff
prosodyctl @ 5160:da7fe5de82fb
Merge 0.9 -> trunk (like this?)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parent | 5152:fee5f8d4ec74 |
| parent | 5143:a86efd60425f |
| child | 5303:19a4a3462574 |
