Mercurial > prosody-hg
diff util/caps.lua @ 4226:decfa487e1e8
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 18 Mar 2011 10:33:38 +0000 |
| parents | 20e99763a08a |
| children | bd0ff8ae98a8 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 18 Mar 2011 10:33:38 +0000 |
| parents | 20e99763a08a |
| children | bd0ff8ae98a8 |