diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-21 14:52:43 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-21 14:52:43 +0100 |
commit | 1193a4bdb914eba2a902ae5275bd56438bd49b55 (patch) | |
tree | 85a3c7b4d4efadd9c68b69eac3178dca98372e19 /Makefile | |
parent | 0a88a8699681f8ebf26b2f86531328c583c97f7b (diff) | |
parent | 6a65e76fc615bd10c21776bd4c4455ab522d2f29 (diff) | |
download | prosody-1193a4bdb914eba2a902ae5275bd56438bd49b55.tar.gz prosody-1193a4bdb914eba2a902ae5275bd56438bd49b55.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions