Comparison

plugins/muc/muc.lib.lua @ 2926:fc96d439453b

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 22 Mar 2010 17:26:12 +0000
parent 2880:a3f6cc3417f2
parent 2925:692b3c6c5bd2
child 2985:fde53d82fde0
comparison
equal deleted inserted replaced
2921:f0ddfd7739ea 2926:fc96d439453b
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