diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-04-29 10:44:18 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-04-29 10:44:18 +0100 |
commit | 491dd96b247d30765711215d7ce0161af8e3f73e (patch) | |
tree | 692b1c0cd9383d0c9d510eb1b37f8fc328b3e040 /prosody.cfg.lua.dist | |
parent | e157445db73e3901eced621c1117a1ea508ea4b6 (diff) | |
parent | 073282787b0f983a57863ad2304c7daf7d3a9066 (diff) | |
download | prosody-491dd96b247d30765711215d7ce0161af8e3f73e.tar.gz prosody-491dd96b247d30765711215d7ce0161af8e3f73e.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions