Merge branch 'master' into IOMultiplexer

author pk910 <philipp@zoelle1.de>

Mon, 27 Aug 2012 04:15:57 +0000 (06:15 +0200)

committer pk910 <philipp@zoelle1.de>

Mon, 27 Aug 2012 04:15:57 +0000 (06:15 +0200)
author pk910 <philipp@zoelle1.de>
Mon, 27 Aug 2012 04:15:57 +0000 (06:15 +0200)
committer pk910 <philipp@zoelle1.de>
Mon, 27 Aug 2012 04:15:57 +0000 (06:15 +0200)
diff --cc src/IRCParser.c
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/modules.c
Simple merge
diff --cc src/modules/module.h
Simple merge
author	pk910 <philipp@zoelle1.de>
	Mon, 27 Aug 2012 04:15:57 +0000 (06:15 +0200)
committer	pk910 <philipp@zoelle1.de>
	Mon, 27 Aug 2012 04:15:57 +0000 (06:15 +0200)
		1	2
src/IRCParser.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/modules.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/modules/module.h	patch \|	diff1 \|	diff2 \|	blob \| history