Merge pull request #1864 from bencorlett/develop

Lining up translation.
This commit is contained in:
Taylor Otwell
2013-04-10 20:12:31 -07:00