aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-01-18 18:46:31 +0000
committerMatthew Wild <mwild1@gmail.com>2014-01-18 18:46:31 +0000
commited8030da5147e3ef3fdf13327e69a3a3f31e7dac (patch)
treeefa0d4a591840269956109110cd373cf82de3ef8 /Makefile
parenta651d9102302e73f181bc3a81ecdae8f9e21b649 (diff)
parent996847e180ee7dfcbc81e920527dfc7d62115cb9 (diff)
downloadprosody-ed8030da5147e3ef3fdf13327e69a3a3f31e7dac.tar.gz
prosody-ed8030da5147e3ef3fdf13327e69a3a3f31e7dac.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions