diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-01-12 06:19:55 -0500 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-01-12 06:19:55 -0500 |
commit | 6a177d7ad6517cd53943c4e03d2bac578d251108 (patch) | |
tree | 4cd51fee2c707c44a8bb6517c5b332a152c99711 /core | |
parent | e60a10abca1ce15ed341a72aaf1f8a3b7c3bf485 (diff) | |
parent | c1ce22bc823d01a478cc2babbcf303d89e4ee4da (diff) | |
download | prosody-6a177d7ad6517cd53943c4e03d2bac578d251108.tar.gz prosody-6a177d7ad6517cd53943c4e03d2bac578d251108.zip |
Merge
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions