Merge branch 'feature/i18n'
authorEvan Coury <me@evancoury.com>
Fri, 6 Jul 2012 20:29:39 +0000 (13:29 -0700)
committerEvan Coury <me@evancoury.com>
Fri, 6 Jul 2012 20:29:39 +0000 (13:29 -0700)
This merges PR #85


Trivial merge