diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-03-20 20:35:59 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-03-20 20:35:59 +0000 |
commit | 1f4c3c34e97e3def573619480115c6a02300af08 (patch) | |
tree | d2c50b12dcf99d03ae30b92a7b72a9ea2203b31b /Makefile | |
parent | 74531442db8df026d362695700a9ff23345dde96 (diff) | |
parent | 478a2d42e6f1be1c45732d3851a65a99ea09565c (diff) | |
download | prosody-1f4c3c34e97e3def573619480115c6a02300af08.tar.gz prosody-1f4c3c34e97e3def573619480115c6a02300af08.zip |
Merge...
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions