diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-04-24 03:23:44 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-04-24 03:23:44 +0100 |
commit | a5efef5aab5624e3a1cb4f1966e719738b859eda (patch) | |
tree | aa0a50335206fc1fd058bae5dc77660b3044a929 /core | |
parent | a4d34ecc45ab3ff928b3823dc6748deee399adba (diff) | |
parent | 2634159a4581c1cc264b20e2094174ae921753d9 (diff) | |
download | prosody-a5efef5aab5624e3a1cb4f1966e719738b859eda.tar.gz prosody-a5efef5aab5624e3a1cb4f1966e719738b859eda.zip |
Merge with Markus Kötter
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions