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/roster.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/roster.py')
-rw-r--r-- | src/roster.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/roster.py b/src/roster.py index afe83c9e..ed9b58f4 100644 --- a/src/roster.py +++ b/src/roster.py @@ -1,18 +1,9 @@ -# Copyright 2010-2011 Le Coz Florent <louiz@louiz.org> +# 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 GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# Poezio 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 Poezio. If not, see <http://www.gnu.org/licenses/>. +# it under the terms of the MIT license. See the COPYING file. """ |