Fix [1964969]: Rename "merfolk fighter" to "merfolk", as it matches the

defined monster name.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5120 c06c8d41-db1a-0410-9941-cceddc491573

Created by  dolorous  on May 18, 2008
BWKYSN365TJINNF346TS7YKUK56OQEQ4ZWZBTJKADZOBBOHDTU3AC
Change contents