diff options
author | Kim Alvefur <zash@zash.se> | 2013-04-09 15:51:08 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-04-09 15:51:08 +0200 |
commit | 890bf7ab7466264a1d334bc0aa8a84c22a4ebf56 (patch) | |
tree | 1bd41093a6d55f3960165ad5b10225a2d9e38a6c /core | |
parent | f9046080ba1340ea049bc4830a41a2e0d84d2530 (diff) | |
parent | d5457e36492d72a959b12b466ba92b21374e7417 (diff) | |
download | prosody-890bf7ab7466264a1d334bc0aa8a84c22a4ebf56.tar.gz prosody-890bf7ab7466264a1d334bc0aa8a84c22a4ebf56.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions