<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -35,7 +35,7 @@ CV: &quot;Cape Verde&quot;
 KY: &quot;Cayman Islands&quot;
 TD: &quot;Chad&quot;
 CL: &quot;Chile&quot;
-C2: &quot;China&quot;
+CN: &quot;China&quot;
 CO: &quot;Colombia&quot;
 KM: &quot;Comoros&quot;
 CK: &quot;Cook Islands&quot;
@@ -123,7 +123,7 @@ NI: &quot;Nicaragua&quot;
 NE: &quot;Niger&quot;
 NU: &quot;Niue&quot;
 NF: &quot;Norfolk Island&quot;
-NO: &quot;Norway&quot;
+&quot;NO&quot;: &quot;Norway&quot;
 OM: &quot;Oman&quot;
 PW: &quot;Palau&quot;
 PA: &quot;Panama&quot;</diff>
      <filename>config/countries.yml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>2eb75a2becc1a113a140119a2899beefe0ee8b7f</id>
    </parent>
    <parent>
      <id>9f6062b551c04f7e3da8255f1a28d87ef62bbf7a</id>
    </parent>
  </parents>
  <author>
    <name>Andy Kim</name>
    <email>andy@potionfactory.com</email>
  </author>
  <url>http://github.com/potionfactory/potionstore/commit/7edc33aa2704bee219cfa625e98082bbad329bf1</url>
  <id>7edc33aa2704bee219cfa625e98082bbad329bf1</id>
  <committed-date>2009-09-26T09:12:30-07:00</committed-date>
  <authored-date>2009-09-26T09:12:30-07:00</authored-date>
  <message>Merge branch 'master' of hiro:/git/potionstore</message>
  <tree>f6d73682c847f907e850c6be7b8687a66f423454</tree>
  <committer>
    <name>Andy Kim</name>
    <email>andy@potionfactory.com</email>
  </committer>
</commit>
