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)
Adds Japansese


Trivial merge