  <option value="CO">Colorado</option>
  <option value="CT">Connecticut</option>
  <option value="DE">Delaware</option>
  <option value="DC">District of Columbia</option>
  <option value="FM">Federated States of Micronesia</option>
  <option value="FL">Florida</option>
  <option value="GA">Georgia</option>
  <option value="GU">Guam</option>
  <option value="HI">Hawaii</option>
  <option value="ID">Idaho</option>
 
</s> remove     ('FM', 'Federated States of Micronesia'),
 </s> add  </s> remove <option value="PW">Palau</option>
 </s> add  </s> remove <option value="MH">Marshall Islands</option>
 </s> add  </s> remove     ('PW', 'Palau'),
 </s> add  </s> remove     ('MH', 'Marshall Islands'),
 </s> add 
  <option value="CO">Colorado</option>
  <option value="CT">Connecticut</option>
  <option value="DE">Delaware</option>
  <option value="DC">District of Columbia</option>

  <option value="FL">Florida</option>
  <option value="GA">Georgia</option>
  <option value="GU">Guam</option>
  <option value="HI">Hawaii</option>
  <option value="ID">Idaho</option>
keep keep keep keep replace keep keep keep keep keep
 Fixed #8425: removed the independant nations of Palau, Marshall Islands, and Micronesia from localflavor's list of US states.

...

Man, commit messages like that are incredibly fun to write.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8550 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
tests/regressiontests/forms/localflavor/us.py