Mercurial > prosody-hg
diff core/moduleapi.lua @ 5160:da7fe5de82fb
Merge 0.9 -> trunk (like this?)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | 6c2c8bf36d22 |
| children | 3275a9705ef3 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 29 Sep 2012 01:05:17 +0200 |
| parents | 6c2c8bf36d22 |
| children | 3275a9705ef3 |