aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-06-09 01:11:12 +0100
committerMatthew Wild <mwild1@gmail.com>2010-06-09 01:11:12 +0100
commit061df0df373dc555e0b9e4c9c6ca022f3905f9de (patch)
tree026f9f66b877f2868515a023775c5fccfdc68fb6 /Makefile
parent1357c719b98ae25b8cc593005371d59dc5182c4d (diff)
parent8736c7f83f55f7b2b8c7c74ac7f9af14254a7f80 (diff)
downloadprosody-061df0df373dc555e0b9e4c9c6ca022f3905f9de.tar.gz
prosody-061df0df373dc555e0b9e4c9c6ca022f3905f9de.zip
Merge 0.7->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions