* Changed remaining bEquipmentMatk bonuses to bMatk in item_combo_db (follow-up r16981).
* Reverted r17116.
* Merged eAthena ea:15231, ea:15232 by ai4rei.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17117 54d463be-8e91-2dee-dedb-b68131a5f0ec