# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1280374839 25200
# Node ID 9a37a94fed68fe851583f4ed1e03c641707a9884
# Parent  1fa9ca23d6967e70d534759be0bb6ed0057b1b00# Parent  f207357d7ca98e4a9ce61cf29b24ffa7c5ec6806
merging, the fun

diff -r 1fa9ca23d696 -r 9a37a94fed68 setup.py
--- a/setup.py	Tue Mar 02 16:34:51 2010 -0500
+++ b/setup.py	Wed Jul 28 20:40:39 2010 -0700
@@ -14,8 +14,8 @@
       author='Jeff Hammel',
       author_email='k0scist@gmail.com',
       url='http://k0s.org',
-      keywords='trac plugin',
-      license="",
+      keywords='',
+      license="GPL",
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests*']),
       include_package_data=True,
       install_requires = [ 'PasteScript' ],