diff options
| author | Florent Le Coz <louiz@louiz.org> | 2011-09-09 19:13:56 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2011-09-09 19:13:56 +0200 |
| commit | eacf2bf62d18b445bd0a8ba74f6105c5d3286cd4 (patch) | |
| tree | d74ae0ffa9177ba85c158fc9afb0b6d725e84c22 /src/multiuserchat.py | |
| parent | d26845e2a3896755a04a2c338cb2ebb6c9fcc0de (diff) | |
| parent | eb180ed52ee12784ec35213aa89413114a94297e (diff) | |
| download | poezio-eacf2bf62d18b445bd0a8ba74f6105c5d3286cd4.tar.gz poezio-eacf2bf62d18b445bd0a8ba74f6105c5d3286cd4.tar.bz2 poezio-eacf2bf62d18b445bd0a8ba74f6105c5d3286cd4.tar.xz poezio-eacf2bf62d18b445bd0a8ba74f6105c5d3286cd4.zip | |
Merge changes from default branch, too
Diffstat (limited to 'src/multiuserchat.py')
| -rw-r--r-- | src/multiuserchat.py | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/multiuserchat.py b/src/multiuserchat.py index dd936039..1c226553 100644 --- a/src/multiuserchat.py +++ b/src/multiuserchat.py @@ -1,16 +1,9 @@ -# Copyright 2010-2011, Florent Le Coz <louiz@louiz.org> - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation version 3 of the License. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# Copyright 2010-2011 Florent Le Coz <louiz@louiz.org> +# +# This file is part of Poezio. +# +# Poezio is free software: you can redistribute it and/or modify +# it under the terms of the MIT license. See the COPYING file. """ Implementation of the XEP-0045: Multi-User Chat. |