STL-ize an odd, null terminated static const char * []
Merge branch 'master' of git://github.com/wesnoth/wesnoth