Merge branch 'master' into lpc2012

Conflicts:
	gameserver.cbp
	src/account-server/accounthandler.cpp
	src/game-server/attack.cpp
	src/game-server/attack.h
	src/game-server/being.cpp
	src/game-server/being.h
	src/game-server/character.cpp
	src/game-server/character.h
	src/game-server/inventory.cpp
	src/game-server/item.h
	src/game-server/monster.cpp
	src/game-server/monster.h

1 files changed, 1 insertions, 1 deletions

diff --git a/src/net/netcomputer.cpp b/src/net/netcomputer.cpp
index c4af3420..8834f4a6 100644
--- a/src/net/netcomputer.cpp
+++ b/src/net/netcomputer.cpp
@@ -57,7 +57,7 @@ void NetComputer::disconnect(const MessageOut &msg)
 }
 
 void NetComputer::send(const MessageOut &msg, bool reliable,
-                       unsigned int channel)
+                       unsigned channel)
 {
     LOG_DEBUG("Sending message " << msg << " to " << *this);