Mercurial > prosody-hg
comparison plugins/mod_disco.lua @ 5640:4f1889672063
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 02 Jun 2013 19:27:45 +0200 |
| parents | 0439d1349dc1 |
| children | 832ea1e9ac9e |
comparison
equal
deleted
inserted
replaced
| 5638:c5b7f4858014 | 5640:4f1889672063 |
|---|
