merged playerbot master
fixed conflicts
updated rrtn patch
merged playerbot
Merge branch 'master' of git://github.com/mangos/mangos
Merge git://github.com/mangos/mangos
added rrtn fix
updated botguy per rrtn
starting changes for better combat management
Merge branch 'master' of git@github.com:playerbot/mangos
Merge git://github.com/mangos/mangos
merged to mangos 8029 and add guillaumederval suggestion
Merge git://github.com/mangos/mangos
added per walkofdoom
fixed conflicts in player.cpp
fixed to drop quest
merged playerbot
Merge branch 'master' of git://github.com/mangos/mangos
Merge git://github.com/mangos/mangos
updated per rrtn and merged to 8052