Software /
code /
prosody
Diff
core/s2smanager.lua @ 2925:692b3c6c5bd2
Merge 0.6->0.7
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Mon, 22 Mar 2010 17:24:55 +0000 |
parent | 2915:f47bd0f7e2e6 |
parent | 2923:b7049746bd29 |
child | 2951:294c359a05f5 |
line wrap: on
line diff
--- a/core/s2smanager.lua Mon Mar 22 15:05:05 2010 +0000 +++ b/core/s2smanager.lua Mon Mar 22 17:24:55 2010 +0000 @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information.