# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1240908164 -3600
# Node ID 69c9e89471ae23e0d41b09e14d6a8e3cbb684728
# Parent  c04db4a88523f1765d08e5f3f865ce2841acbb54# Parent  e30c2a25101056a53601e9f54e3a421e004619aa
Merge with stable

diff -r c04db4a88523 -r 69c9e89471ae hgkw/keyword.py
--- a/hgkw/keyword.py	Mon Apr 27 18:35:45 2009 +0100
+++ b/hgkw/keyword.py	Tue Apr 28 09:42:44 2009 +0100
@@ -2,8 +2,8 @@
 #
 # Copyright 2007, 2008 Christian Ebert <blacktrash@gmx.net>
 #
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 #
 # $Id$
 #