diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-07-31 07:14:54 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-07-31 07:14:54 +0100 |
commit | 1476fb77d161eca9a1e340fc546b82119e49699c (patch) | |
tree | 8f4e0289c3e75e44a5062bbb7bba8306789b91d6 /COPYING | |
parent | 5c2035b30a344e8bc45ffe4c7329c603cd8e6cd3 (diff) | |
parent | 3b8d61bf9828b5aa1e4f1776b306aeea5dfe8bb7 (diff) | |
download | prosody-1476fb77d161eca9a1e340fc546b82119e49699c.tar.gz prosody-1476fb77d161eca9a1e340fc546b82119e49699c.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions