Comparison

util/prosodyctl.lua @ 2925:692b3c6c5bd2

Merge 0.6->0.7
author Matthew Wild <mwild1@gmail.com>
date Mon, 22 Mar 2010 17:24:55 +0000
parent 2457:102c81e37878
parent 2923:b7049746bd29
child 3294:89dd67cc3689
comparison
equal deleted inserted replaced
2918:79ca9f686aaf 2925:692b3c6c5bd2
1 -- Prosody IM 1 -- Prosody IM
2 -- Copyright (C) 2008-2009 Matthew Wild 2 -- Copyright (C) 2008-2010 Matthew Wild
3 -- Copyright (C) 2008-2009 Waqas Hussain 3 -- Copyright (C) 2008-2010 Waqas Hussain
4 -- 4 --
5 -- This project is MIT/X11 licensed. Please see the 5 -- This project is MIT/X11 licensed. Please see the
6 -- COPYING file in the source package for more information. 6 -- COPYING file in the source package for more information.
7 -- 7 --
8 8