diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-26 16:25:17 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-26 16:25:17 +0100 |
| commit | 26768dfb4dd3682d63b9715c8942b827d52ffd12 (patch) | |
| tree | 860acbb782aa41c41e784e9e2b24cddc760392b2 /doc | |
| parent | a54e59650fb3aef98485286f3ffaf5cdf6140dab (diff) | |
| parent | 887ca5f9fe8ae6730f72c2aea17aaf84ccb8a537 (diff) | |
| download | prosody-26768dfb4dd3682d63b9715c8942b827d52ffd12.tar.gz prosody-26768dfb4dd3682d63b9715c8942b827d52ffd12.zip | |
Merge with backout
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions