Merge remote-tracking branch 'sasezaki/feature/i18n' into feature/i18n
authorEvan Coury <me@evancoury.com>
Fri, 6 Jul 2012 15:22:54 +0000 (08:22 -0700)
committerEvan Coury <me@evancoury.com>
Fri, 6 Jul 2012 15:22:54 +0000 (08:22 -0700)
commitb320a348fb87d48166fbc3b0f0dbfd5830c05dc0
treebf0a0640487888fc337213561493bde4173bdcb5
parent703a089de26e75f9fbd2f6bc70c11fc6a7785fcf
parentb2e2d397b1c745b4282ec28d3d676859ee44d405
Merge remote-tracking branch 'sasezaki/feature/i18n' into feature/i18n

Adds Japansese