diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-01-18 15:08:05 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-01-18 15:08:05 +0000 |
commit | 15517ffb459eec36ebca7f4a783d0b0a13c5794e (patch) | |
tree | 6447d41c94f28fbdab206e8ec5b2866d0700b083 /AUTHORS | |
parent | 8366c1b7339b6b10ebe43009c9f78dd1b1718335 (diff) | |
parent | d79def083bd4f80242ada7e98f4c24d85787305f (diff) | |
download | prosody-15517ffb459eec36ebca7f4a783d0b0a13c5794e.tar.gz prosody-15517ffb459eec36ebca7f4a783d0b0a13c5794e.zip |
Merge with trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions