merge with main

This commit is contained in:
Thomas Arendsen Hein 2008-01-04 07:44:07 +01:00
commit 60daf69b49

View File

@ -2,9 +2,9 @@
#
# Copyright (C) 2007 Kevin Christen <kevin.christen@gmail.com>
#
# This program is free software: you can redistribute it and/or modify it
# 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, either version 3 of the License, or (at your
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@ -13,9 +13,8 @@
# 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/>. This
# software may be used and distributed according to the terms of the GNU
# General Public License, incorporated herein by reference.
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
'''add color output to the status and qseries commands