joomla/joomla-cms — pull request #769 by elinw (2013-03-07 15:22:17+00:00)
Title: Some missed merge fixes

These are some things that must have gotten lost in the back and forth