Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

diff --git a/irc/log b/irc/log
index defc39d..72cdb2e 100644 (file)
--- a/irc/log
+++ b/irc/log
@@ -1144,3 +1144,8 @@
 22:19 < sam_moore> Anyway, bye
 22:23 < jtanx> bye
 22:46 -!- jtanx [[email protected]] has quit ["ChatZilla 0.9.89 [Firefox 22.0/20130618035212]"]
+--- Day changed Sat Aug 17 2013
+10:29 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+17:14 -!- justin_kruger [[email protected]] has joined #mctxuwa_softdev
+17:14 -!- justin_kruger [[email protected]] has quit [EOF From client]
+22:25 -!- jtanx [[email protected]] has quit ["ChatZilla 0.9.89 [Firefox 22.0/20130618035212]"]