Katello/katello — pull request #1634 by lzap (2013-02-21 16:28:44+00:00)
Title: i18n - fixing merge issue introduced by 2cee9ef0d7ee53

And b7daaacd32c73fd3814a7cad

@ehelms @jsherr ?