diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-18 00:10:52 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-18 00:10:52 +0100 |
| commit | e848839db37318dd19ebd15c7c09e857df564ed0 (patch) | |
| tree | 0604a6d66c0c755bf29a09127cce1c4ce854f6ac /core | |
| parent | 08eceec2bf30cec73020e3926f7dd2fca5aba3ab (diff) | |
| parent | 6dced9f4823fd0353f3129df56b835cba6e82da6 (diff) | |
| download | prosody-e848839db37318dd19ebd15c7c09e857df564ed0.tar.gz prosody-e848839db37318dd19ebd15c7c09e857df564ed0.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions