Merge branch 'master' into schooly
about to bring in newer pircbot code
added in newer pircbot code
added in newer pircbot code
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch schooly
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   .gitignore
#	renamed:    src/org/jibble/pircbotm/Colors.java -> src/org/jibble/pircbot/Colors.java
#	renamed:    src/org/jibble/pircbotm/DccChat.java -> src/org/jibble/pircbot/DccChat.java
#	renamed:    src/org/jibble/pircbotm/DccFileTransfer.java -> src/org/jibble/pircbot/DccFileTransfer.java
#	renamed:    src/org/jibble/pircbotm/DccManager.java -> src/org/jibble/pircbot/DccManager.java
#	new file:   src/org/jibble/pircbot/IdentServer.java
#	renamed:    src/org/jibble/pircbotm/InputThread.java -> src/org/jibble/pircbot/InputThread.java
#	renamed:    src/org/jibble/pircbotm/IrcException.java -> src/org/jibble/pircbot/IrcException.java
#	renamed:    src/org/jibble/pircbotm/NickAlreadyInUseException.java -> src/org/jibble/pircbot/NickAlreadyInUseException.java
#	renamed:    src/org/jibble/pircbotm/OutputThread.java -> src/org/jibble/pircbot/OutputThread.java
#	renamed:    src/org/jibble/pircbotm/PircBot.java -> src/org/jibble/pircbot/PircBot.java
#	new file:   src/org/jibble/pircbot/Queue.java
#	renamed:    src/org/jibble/pircbotm/ReplyConstants.java -> src/org/jibble/pircbot/ReplyConstants.java
#	renamed:    src/org/jibble/pircbotm/User.java -> src/org/jibble/pircbot/User.java
#	deleted:    src/org/jibble/pircbotm/IRCMsg.java
#	deleted:    src/org/jibble/pircbotm/IdentServer.java
#	deleted:    src/org/jibble/pircbotm/MsgQueue.java
#	deleted:    src/org/jibble/pircbotm/Queue.java
#	modified:   src/org/tsd/tsdbot/TSDBot.java
#	modified:   src/org/tsd/tsdbot/TSDBotLauncher.java
#	renamed:    src/org/tsd/tsdbot/runnable/Strawpoll.java -> src/org/tsd/tsdbot/runnable/StrawPoll.java
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   src/org/jibble/pircbot/PircBot.java
#	modified:   src/org/jibble/pircbot/User.java
#	modified:   src/org/tsd/tsdbot/TSDBot.java
#	modified:   src/org/tsd/tsdbot/TSDBotLauncher.java
#	modified:   src/org/tsd/tsdbot/runnable/TweetPoll.java
#
small changes
Merge branch 'schooly'