diff options
| author | Kim Alvefur <zash@zash.se> | 2014-07-04 23:05:27 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-07-04 23:05:27 +0200 |
| commit | 4ee00880c225db985b26614eeb0b3d0d39487c99 (patch) | |
| tree | 41f4db74c0b05563f71d07478a4d8b3c106359af /Makefile | |
| parent | 6c75e23434fd4ba3eed580582ade3ad8337fd585 (diff) | |
| parent | 260fc78e4095f1e4ed74d4e76dc1eb23713bacf1 (diff) | |
| download | prosody-4ee00880c225db985b26614eeb0b3d0d39487c99.tar.gz prosody-4ee00880c225db985b26614eeb0b3d0d39487c99.zip | |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions