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)
commit27b1b737222237f08bb2fae8d2588ee8089dc7bf
tree9e5857381a424c0deda68fdebfced3e4d1c54feb
parent00d825e7a507f95e2a3cbde2901547d9d1593412
parentcdc1e98f42803fe0552be5d9e30c999b792d9974
Merge branch 'feature/i18n'

This merges PR #85