Merge branch 'master' into 308
commitee8183fe75f05289fca7668d02e2ed3ddcfbe7c5
authortomrus88 <tomrus88@gmail.com>
Wed, 21 Jan 2009 07:59:27 +0000 (21 10:59 +0300)
committertomrus88 <tomrus88@gmail.com>
Wed, 21 Jan 2009 07:59:27 +0000 (21 10:59 +0300)
tree762000a273d87195dbb37a17148659bcad486a2a
parentc35781c84c773e8e9cfcb643eb829824c96cfc6e
parent4546b68f354ba2ff7dc9c41190b6b21301b5ba3e
Merge branch 'master' into 308
src/game/GossipDef.cpp
src/game/Spell.cpp