From: zonidjan <redacted>
Date: Wed, 5 Feb 2014 20:39:28 +0000 (-0600)
Subject: Merge branch 'master' of localhost:erebus
X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/56c245f76148a247e866634d134cdbab7eba034c?hp=472ca0641d9ee9ebb5b425cbe73196fe86bbb810

Merge branch 'master' of localhost:erebus
---

diff --git a/modules/eval.py b/modules/eval.py
index 6e19282..7536198 100644
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -1,9 +1,10 @@
-# Erebus IRC bot - Author: John Runyon
+# Erebus IRC bot - Author: Erebus Team
 # !EVAL and !EXEC commands
+# This file is released into the public domain; see http://unlicense.org/
 
 # module info
 modinfo = {
-	'author': 'John Runyon (DimeCadmium)',
+	'author': 'Erebus Team',
 	'license': 'public domain',
 	'compatible': [1],
 	'depends': [],
diff --git a/modules/foo.py b/modules/foo.py
index f2a394a..8063afb 100644
--- a/modules/foo.py
+++ b/modules/foo.py
@@ -1,10 +1,10 @@
-# Erebus IRC bot - Author: John Runyon
+# Erebus IRC bot - Author: Erebus Team
 # simple module example
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
 modinfo = {
-	'author': 'John Runyon (DimeCadmium)',
+	'author': 'Erebus Team',
 	'license': 'public domain',
 	'compatible': [1], # compatible module API versions
 	'depends': [], # other modules required to work properly?
diff --git a/modules/module.py b/modules/module.py
index 8a2989c..33be1ff 100644
--- a/modules/module.py
+++ b/modules/module.py
@@ -1,10 +1,10 @@
-# Erebus IRC bot - Author: John Runyon
+# Erebus IRC bot - Author: Erebus Team
 # module control through irc
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
 modinfo = {
-	'author': 'John Runyon (DimeCadmium)',
+	'author': 'Erebus Team',
 	'license': 'public domain',
 	'compatible': [1], # compatible module API versions
 	'depends': [], # other modules required to work properly?
diff --git a/modules/spotify.py b/modules/spotify.py
index fe4e037..9ee323e 100644
--- a/modules/spotify.py
+++ b/modules/spotify.py
@@ -1,10 +1,10 @@
-# Erebus IRC bot - Author: Conny Sjoblom
+# Erebus IRC bot - Author: Erebus Team
 # Spotify URL Checker
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
 modinfo = {
-	'author': 'Conny Sjoblom',
+	'author': 'Erebus Team',
 	'license': 'public domain',
 	'compatible': [1], # compatible module API versions
 	'depends': [], # other modules required to work properly?
diff --git a/modules/twitch.py b/modules/twitch.py
index fdd7b32..6357459 100644
--- a/modules/twitch.py
+++ b/modules/twitch.py
@@ -1,10 +1,10 @@
-# Erebus IRC bot - Author: Conny Sjoblom
+# Erebus IRC bot - Author: Erebus Team
 # Twitch URL Checker
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
 modinfo = {
-	'author': 'Conny Sjoblom',
+	'author': 'Erebus Team',
 	'license': 'public domain',
 	'compatible': [1], # compatible module API versions
 	'depends': [], # other modules required to work properly?
diff --git a/modules/youtube.py b/modules/youtube.py
index 639e32f..c40bf17 100644
--- a/modules/youtube.py
+++ b/modules/youtube.py
@@ -1,10 +1,10 @@
-# Erebus IRC bot - Author: Conny Sjoblom
+# Erebus IRC bot - Author: Erebus Team
 # Youtube URL Checker
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
 modinfo = {
-	'author': 'Conny Sjoblom',
+	'author': 'Erebus Team',
 	'license': 'public domain',
 	'compatible': [1], # compatible module API versions
 	'depends': [], # other modules required to work properly?