diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-01-29 03:07:30 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-01-29 03:07:30 +0000 |
commit | 30822c33c06a580a8c2e27f8132a9da8960f5bf3 (patch) | |
tree | 85a5ae76f0fa5a745a7826506fd5cfa59c42088d /Makefile | |
parent | 01fd496348b77267d56f72211b430b5516629b32 (diff) | |
parent | ee7f33faec6f9785b8ed913efd2fb611158c517e (diff) | |
download | prosody-30822c33c06a580a8c2e27f8132a9da8960f5bf3.tar.gz prosody-30822c33c06a580a8c2e27f8132a9da8960f5bf3.zip |
Merge backed out changeset
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions