aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-09-10 23:17:06 +0100
committerMatthew Wild <mwild1@gmail.com>2012-09-10 23:17:06 +0100
commitc1fdd165bed28e7914d406938c278d811ef2bd65 (patch)
tree6bfc6f9e4c7f37e2bdc3f7dc065baf6eca197257 /Makefile
parent2ea9714c6f63b8d5d0b74c14f47eab55b8b5957d (diff)
parentd617081ac45113fdaa8fc0604bee29a08d4aefed (diff)
downloadprosody-c1fdd165bed28e7914d406938c278d811ef2bd65.tar.gz
prosody-c1fdd165bed28e7914d406938c278d811ef2bd65.zip
Merge 0.9->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions