Mercurial > prosody-hg
diff core/moduleapi.lua @ 5897:296e32a1ff33
Merge 0.10 -> trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parents | ac5e05ffc921 |
| children | 26f54b462601 6a184b16b717 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parents | ac5e05ffc921 |
| children | 26f54b462601 6a184b16b717 |