Merge branch 'develop' into refresh

2013-11-30 16:59:03 +13:00 · 2013-11-30 16:59:03 +13:00 · 06a5cadd2f
commit 06a5cadd2f
parent 6ff926246b 6b4f3ac546
61 changed files with 0 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/0
+++ b/0
--- a/README.md
+++ b/README.md
--- a/cloudbot.py
+++ b/cloudbot.py
--- a/core/config.py
+++ b/core/config.py
--- a/core/db.py
+++ b/core/db.py
--- a/core/irc.py
+++ b/core/irc.py
--- a/core/main.py
+++ b/core/main.py
--- a/plugins/admin.py
+++ b/plugins/admin.py
--- a/plugins/brainfuck.py
+++ b/plugins/brainfuck.py
--- a/plugins/choose.py
+++ b/plugins/choose.py
--- a/plugins/coin.py
+++ b/plugins/coin.py
--- a/plugins/core_ctcp.py
+++ b/plugins/core_ctcp.py
--- a/plugins/core_misc.py
+++ b/plugins/core_misc.py
--- a/plugins/core_sieve.py
+++ b/plugins/core_sieve.py
--- a/plugins/cypher.py
+++ b/plugins/cypher.py
--- a/plugins/dice.py
+++ b/plugins/dice.py
--- a/plugins/dictionary.py
+++ b/plugins/dictionary.py
--- a/plugins/down.py
+++ b/plugins/down.py
--- a/plugins/drama.py
+++ b/plugins/drama.py
--- a/plugins/eightball.py
+++ b/plugins/eightball.py
--- a/plugins/fact.py
+++ b/plugins/fact.py
--- a/plugins/factoids.py
+++ b/plugins/factoids.py
--- a/plugins/fmylife.py
+++ b/plugins/fmylife.py
--- a/plugins/fortune.py
+++ b/plugins/fortune.py
--- a/plugins/geoip.py
+++ b/plugins/geoip.py
--- a/plugins/google.py
+++ b/plugins/google.py
--- a/plugins/help.py
+++ b/plugins/help.py
--- a/plugins/ignore.py
+++ b/plugins/ignore.py
--- a/plugins/imdb.py
+++ b/plugins/imdb.py
--- a/plugins/lastfm.py
+++ b/plugins/lastfm.py
--- a/plugins/log.py
+++ b/plugins/log.py
--- a/plugins/metacritic.py
+++ b/plugins/metacritic.py
--- a/plugins/minecraft_items.py
+++ b/plugins/minecraft_items.py
--- a/plugins/minecraft_status.py
+++ b/plugins/minecraft_status.py
--- a/plugins/minecraft_wiki.py
+++ b/plugins/minecraft_wiki.py
--- a/plugins/namegen.py
+++ b/plugins/namegen.py
--- a/plugins/op.py
+++ b/plugins/op.py
--- a/plugins/password.py
+++ b/plugins/password.py
--- a/plugins/ping.py
+++ b/plugins/ping.py
--- a/plugins/potato.py
+++ b/plugins/potato.py
--- a/plugins/quote.py
+++ b/plugins/quote.py
--- a/plugins/seen.py
+++ b/plugins/seen.py
--- a/plugins/shorten.py
+++ b/plugins/shorten.py
--- a/plugins/slogan.py
+++ b/plugins/slogan.py
--- a/plugins/snopes.py
+++ b/plugins/snopes.py
--- a/plugins/spellcheck.py
+++ b/plugins/spellcheck.py
--- a/plugins/stock.py
+++ b/plugins/stock.py
--- a/plugins/system.py
+++ b/plugins/system.py
--- a/plugins/tell.py
+++ b/plugins/tell.py
--- a/plugins/time.py
+++ b/plugins/time.py
--- a/plugins/title.py
+++ b/plugins/title.py
--- a/plugins/tvdb.py
+++ b/plugins/tvdb.py
--- a/plugins/twitter.py
+++ b/plugins/twitter.py
--- a/plugins/urban.py
+++ b/plugins/urban.py
--- a/plugins/validate.py
+++ b/plugins/validate.py
--- a/plugins/vimeo.py
+++ b/plugins/vimeo.py
--- a/plugins/weather.py
+++ b/plugins/weather.py
--- a/plugins/wikipedia.py
+++ b/plugins/wikipedia.py
--- a/plugins/wolframalpha.py
+++ b/plugins/wolframalpha.py
--- a/plugins/youtube.py
+++ b/plugins/youtube.py