diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-09-13 18:49:25 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-09-13 18:49:25 +0100 |
commit | 8ffa6ad43baaab15a9bf11d51d229312315ac44e (patch) | |
tree | bb4cdcf32285e8fd61bdfbf98ef8402bea2f4ff4 /Makefile | |
parent | b3714103ae4098fa1e22d0504365607f688f7a83 (diff) | |
parent | ec98274a21953200ae89e504e6bdefea9e1e2bba (diff) | |
download | prosody-8ffa6ad43baaab15a9bf11d51d229312315ac44e.tar.gz prosody-8ffa6ad43baaab15a9bf11d51d229312315ac44e.zip |
Merge 0.9->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions