<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>COPYING.rbot</filename>
    </added>
    <added>
      <filename>GPLv2</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,21 +1,8 @@
-Copyright (C) 2002-2005 Tom Gilbert.
+rbot the Ruby IRC bot
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the &quot;Software&quot;), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Copyright (C) 2007-2008 Giuseppe Bilotta and the rbot development team
 
-The above copyright notice and this permission notice shall be included in
-all copies of the Software and its documentation and acknowledgment shall be
-given in the documentation and software packages that this Software was
-used.
-
-THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+This program is free software; you can redistribute it and/or modify it
+under the terms of the MIT license with acknolwedgement clause (see
+COPYING.rbot) or the GNU General Public License, version 2 (see GPLv2)
 </diff>
      <filename>COPYING</filename>
    </modified>
    <modified>
      <diff>@@ -36,26 +36,10 @@ Please note that the logfile doesn't contain IRC logs (which are located at
 
 =end
 
-# Copyright (C) 2002 Tom Gilbert.
+# Copyright (C) 2002-2006 Tom Gilbert.
+# Copyright (C) 2007-2008 Giuseppe Bilotta and the rbot development team
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the &quot;Software&quot;), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies of the Software and its documentation and acknowledgment shall be
-# given in the documentation and software packages that this Software was
-# used.
-#
-# THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# This is free software, see COPYING for licensing details
 
 $VERBOSE=true
 </diff>
      <filename>bin/rbot</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 #
 # rbot user management
 # Author:: Giuseppe Bilotta (giuseppe.bilotta@gmail.com)
-# Copyright:: Copyright (c) 2006 Giuseppe Bilotta
-# License:: GPLv2
 
 require 'singleton'
 require 'set'</diff>
      <filename>lib/rbot/botuser.rb</filename>
    </modified>
    <modified>
      <diff>@@ -7,8 +7,6 @@
 # so we have to handle this case.
 #
 # Author:: Giuseppe Bilotta (giuseppe.bilotta@gmail.com)
-# Copyright:: Copyright (c) 2006 Giuseppe Bilotta
-# License:: GPLv2
 
 module Irc
   Config = Bot::Config</diff>
      <filename>lib/rbot/config-compat.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: rbot auth management from IRC
 #
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 
 class AuthModule &lt; CoreBotModule
 </diff>
      <filename>lib/rbot/core/auth.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: rbot basic management from IRC
 #
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 
 class BasicsModule &lt; CoreBotModule
 </diff>
      <filename>lib/rbot/core/basics.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: rbot config management from IRC
 #
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 
 class ConfigModule &lt; CoreBotModule
 </diff>
      <filename>lib/rbot/core/config.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: filters management from IRC
 #
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
-# Copyright:: (C) 2008 Giuseppe Bilotta
-# License:: GPL v2
 
 class FiltersModule &lt; CoreBotModule
 </diff>
      <filename>lib/rbot/core/filters_ui.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: rbot IRC logging facilities
 #
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
-# Copyright:: (C) 2008 Giuseppe Bilotta
-# License:: GPL v2
 
 class IrcLogModule &lt; CoreBotModule
 </diff>
      <filename>lib/rbot/core/irclog.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: Remote service provider for rbot
 #
 # Author:: Giuseppe Bilotta (giuseppe.bilotta@gmail.com)
-# Copyright:: Copyright (c) 2006 Giuseppe Bilotta
-# License:: GPLv2
 #
 # From an idea by halorgium &lt;rbot@spork.in&gt;.
 #</diff>
      <filename>lib/rbot/core/remote.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: Unicode plugin
 #
 # Author:: jsn (Dmitry Kim) &lt;dmitry dot kim at gmail dot org&gt;
-# Copyright:: (C) 2007 Dmitry Kim
-# License:: public domain
 #
 # This plugin adds unicode-awareness to rbot. When it's loaded, all the
 # character strings inside of rbot are assumed to be in proper utf-8</diff>
      <filename>lib/rbot/core/unicode.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: rbot user data management from IRC
 #
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 
 module ::Irc
   class User</diff>
      <filename>lib/rbot/core/userdata.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: Standard classes extensions
 #
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 #
 # This file collects extensions to standard Ruby classes and to some core rbot
 # classes to be used by the various plugins</diff>
      <filename>lib/rbot/core/utils/extends.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,8 +4,6 @@
 # :title: Stream filters
 #
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
-# Copyright:: (C) 2008 Giuseppe Bilotta
-# License:: GPL v2
 #
 # This file collects methods to handle 'stream filters', a generic mechanism
 # to transform text+attributes into other text+attributes</diff>
      <filename>lib/rbot/core/utils/filters.rb</filename>
    </modified>
    <modified>
      <diff>@@ -6,10 +6,6 @@
 # Author:: Tom Gilbert &lt;tom@linuxbrit.co.uk&gt;
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
 # Author:: Dmitry &quot;jsn&quot; Kim &lt;dmitry point kim at gmail point com&gt;
-#
-# Copyright:: (C) 2002-2005 Tom Gilbert
-# Copyright:: (C) 2006 Tom Gilbert, Giuseppe Bilotta
-# Copyright:: (C) 2007 Giuseppe Bilotta, Dmitry Kim
 
 require 'resolv'
 require 'net/http'</diff>
      <filename>lib/rbot/core/utils/httputil.rb</filename>
    </modified>
    <modified>
      <diff>@@ -6,9 +6,6 @@
 # Author:: Tom Gilbert &lt;tom@linuxbrit.co.uk&gt;
 # Author:: Giuseppe &quot;Oblomov&quot; Bilotta &lt;giuseppe.bilotta@gmail.com&gt;
 #
-# Copyright:: (C) 2002-2006 Tom Gilbert
-# Copyright:: (C) 2007 Giuseppe Bilotta
-#
 # TODO some of these Utils should be rewritten as extensions to the approriate
 # standard Ruby classes and accordingly be moved to extends.rb
 </diff>
      <filename>lib/rbot/core/utils/utils.rb</filename>
    </modified>
    <modified>
      <diff>@@ -16,8 +16,6 @@
 # This module defines the fundamental building blocks for IRC
 #
 # Author:: Giuseppe Bilotta (giuseppe.bilotta@gmail.com)
-# Copyright:: Copyright (c) 2006 Giuseppe Bilotta
-# License:: GPLv2
 
 require 'singleton'
 </diff>
      <filename>lib/rbot/irc.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>b2af728968fcb8c1e109164332a1094cc17c9102</id>
    </parent>
  </parents>
  <author>
    <name>Giuseppe Bilotta</name>
    <email>giuseppe.bilotta@gmail.com</email>
  </author>
  <url>http://github.com/jsn/rbot/commit/b3300cabeda816b79a592c3e7704abbbd3b5505c</url>
  <id>b3300cabeda816b79a592c3e7704abbbd3b5505c</id>
  <committed-date>2008-04-22T01:02:02-07:00</committed-date>
  <authored-date>2008-04-22T00:53:22-07:00</authored-date>
  <message>Licensing uniformity: dual-license rbot core under MIT+acknowledgement and GPLv2</message>
  <tree>1cd70255d26e53882b9e0deb4ea17eed1c8cf469</tree>
  <committer>
    <name>Giuseppe Bilotta</name>
    <email>giuseppe.bilotta@gmail.com</email>
  </committer>
</commit>
