Merged /scms/s/crop_craftsman_sphere/d
Merged /scms/s/ghana_manx_bottom/d
Merged /scms/s/clerk_strident_shampoo/d
Merge branch 'master' of github.com:smogon/scms