A por el conflicto
A por el conflicto
Merge branch 'master' of github.com:padsof-uam/redes2

Conflicts:
	G-2301-11-P2/src/irc_processor.c
	G-2301-11-P2/srclib/libircgui/chat_funcs.c
Merge branch 'master' of github.com:padsof-uam/redes2