Parental Bond Recoil
Merge branch 'master' of git://github.com/VeteranPadgett/pokemon-online
Fix Counter
Merge pull request #1313 from Fuzzysqurl/master

Fix random tooltip error in Gen 1
Weather stays as long as there's another user with the same ability... which makes my lazy method the better way of doing it
Merge branch 'master' of github.com:po-devs/pokemon-online
Freeze-Dry to Glalie
Add German mega stone translations
2.5.1
Merge pull request #1315 from turbedi/UpdateMoveTranslations

Add German mega stone translations
Dragon Ascent should be close combat
Attempt #2
Return of the Dragon Ascent
Fix play rough
Merge branch 'master' of git://github.com/po-devs/pokemon-online

Conflicts:
	src/BattleServer/battle.cpp
	src/BattleServer/moves.cpp
Showing damage
Fix Play Rough
Fix Auras + Tough Claws