Mercurial > prosody-hg
diff Makefile @ 6727:eb9c842b80fa
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 May 2015 23:23:44 +0200 |
| parents | b7796a46aec2 |
| children | 533fd843d91f |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 May 2015 23:23:44 +0200 |
| parents | b7796a46aec2 |
| children | 533fd843d91f |