diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-04 23:36:50 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-04 23:36:50 +0100 |
| commit | bb00df3f5e95d57c7dff489c5a3da1b292251f85 (patch) | |
| tree | f77f1673a20e30d53488924ed31f2e8d286a78f1 /Makefile | |
| parent | f050b618466ad7d6008fc96d3860c0ad868af7e8 (diff) | |
| parent | 3376282d8aacc5814519e16c8b04809f24b9f248 (diff) | |
| download | prosody-bb00df3f5e95d57c7dff489c5a3da1b292251f85.tar.gz prosody-bb00df3f5e95d57c7dff489c5a3da1b292251f85.zip | |
Merge 0.7->trunk (with MUC needing checking, waqas)
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions