Mercurial > prosody-hg
diff util/dataforms.lua @ 5759:767e29b2cd3a
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Jul 2013 21:50:38 +0200 |
| parents | ef490e9276df |
| children | bd0ff8ae98a8 7dcd6f124c93 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Jul 2013 21:50:38 +0200 |
| parents | ef490e9276df |
| children | bd0ff8ae98a8 7dcd6f124c93 |