copyright and licensing issues: Artistic License _or_ GPL

[infobot.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index 5f221241e800cf54f0ab26ea1ca12799346bbd46..47d9fe5f12cf7d9e047bcc789608654a5a63b628 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,11 @@
+Infobot is Copyright (C) 1997-2015, by Tim Riker <Tim@Rikers.org> and others.
 
+It is free software; you can redistribute it and/or modify it under the terms of either:
+
+a) the GNU General Public License as published by the Free Software Foundation;
+   either version 1, or (at your option) any later version, or
+
+b) the "Artistic License" as contained here: