Move PopToken into an unnamed namespace.
Merge branch 'master' into c++11

Conflicts:
	IrcClient.cpp