Mercurial > prosody-hg
diff util/datamanager.lua @ 6727:eb9c842b80fa
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 May 2015 23:23:44 +0200 |
| parents | 0217a04722c7 |
| children | 5de6b93d0190 67ac4a0b6e50 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 May 2015 23:23:44 +0200 |
| parents | 0217a04722c7 |
| children | 5de6b93d0190 67ac4a0b6e50 |