Nay 846870bf6c Merge branch 'master' into 4.x ...

Conflicts:
	src/server/shared/Database/Implementation/CharacterDatabase.cpp

2011-11-26 03:19:37 +00:00

..

characters

Core/Misc: Fix compile and char creation

2011-11-26 01:46:41 +01:00

world

Merge branch 'master' into 4.x

2011-11-26 03:19:37 +00:00