aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-10-05 15:37:46 +0200
committerKim Alvefur <zash@zash.se>2014-10-05 15:37:46 +0200
commiteab5feadd71d6a044ecfcc8131fd3b7ed350dc97 (patch)
treec419f2d0ba15e1d5364c44a1e2b6f89e99f16f85 /Makefile
parentacf786ed7dcca32a0ee768fac6f33d35674fc1b6 (diff)
parente4a6b7e39a2f9159ebd9da49771a40ff10474866 (diff)
downloadprosody-eab5feadd71d6a044ecfcc8131fd3b7ed350dc97.tar.gz
prosody-eab5feadd71d6a044ecfcc8131fd3b7ed350dc97.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions