Merged /scms/s/warlike_calendar_bank/d
Merge branch 'master' of github.com:smogon/scms